fiddlerwoaroof/crawl - Change 2Z6IWKMEWE4OIFVWFSZBA2SIXMBJNV6H6LNEPOXTJZW433ABU4EQC

Remove atk and def from melee_attack.

Rewrite some code to use actor methods instead of calling things directly. In theory, attacker_as_monster() and defender_as_monster() are hacks; any calls to them that can be replaced by calls to actor methods should be. Fix some inconsistencies with monster bleeding and summoned creatures. (This should probably go into actor::can_bleed().)

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

Created by haranp on January 13, 2009

2Z6IWKMEWE4OIFVWFSZBA2SIXMBJNV6H6LNEPOXTJZW433ABU4EQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 3173 [19.804403]
B:BD[18.2960] → [4.3337:3383]
```
    if (is_unchivalric_attack(&you, mon, mon)
```
[18.2960]
[4.3383]
```
    if (is_unchivalric_attack(&you, mon)
```

Insertion in crawl-ref/source/player.cc at line 7144 [19.962854]

[20.3816]

[21.55]

}
bool player::can_bleed() const
{
    if (you.is_undead && (you.species != SP_VAMPIRE
                          || you.hunger_state <= HS_SATIATED))
    {
        return (false);
    }
    
    const int tran = you.attribute[ATTR_TRANSFORMATION];
    if (tran == TRAN_STATUE || tran == TRAN_ICE_BEAST
        || tran == TRAN_AIR || tran == TRAN_LICH
        || tran == TRAN_SPIDER) // Monster spiders don't bleed either.
    {
        return (false);
    }
    return (true);

Replacement in crawl-ref/source/monstuff.cc at line 6266 [19.1396662]

B:BD[22.2877] → [22.2877:2946]

                        if (is_unchivalric_attack(monster, mon, mon)

[22.2877]

[22.2946]

                        if (is_unchivalric_attack(monster, mon)

Insertion in crawl-ref/source/mon-util.cc at line 7486 [19.1699344]
[23.1624]
[24.2701]
```
bool monsters::can_bleed() const
{
    return (mons_has_blood(type));
}
```
Deletion in crawl-ref/source/misc.h at line 46 [19.1928926]
B:BD[19.1932235] → [25.3925:3961]
```
bool victim_can_bleed(int montype);
```

Deletion in crawl-ref/source/misc.cc at line 1103 [19.1933596]

∅:D[12.4616] → [26.10103:10105]

B:BD[26.10103] → [26.10103:10105]

∅:D[26.10105] → [27.4537:4538]

B:BD[19.1937067] → [27.4537:4538]

B:BD[27.4538] → [28.10355:10421]

∅:D[28.10421] → [25.3963:3998]

B:BD[27.4603] → [25.3963:3998]

∅:D[25.3998] → [27.4645:4742]

B:BD[27.4645] → [27.4645:4742]

B:BD[27.4742] → [29.3165:3232]

∅:D[29.3232] → [27.4805:5020]

∅:D[30.4325] → [27.4805:5020]

B:BD[27.4805] → [27.4805:5020]

B:BD[27.5020] → [31.5881:5956]

∅:D[31.5956] → [27.5094:5171]

B:BD[27.5094] → [27.5094:5171]

B:BD[27.5171] → [30.4326:4327]

B:BD[30.4327] → [31.5957:5984]

∅:D[31.5984] → [26.10106:10144]

B:BD[27.5202] → [26.10106:10144]

}
// Checks whether the player or a monster is capable of bleeding.
bool victim_can_bleed(int montype)
{
    if (montype == -1) // player
    {
        if (you.is_undead && (you.species != SP_VAMPIRE
                              || you.hunger_state <= HS_SATIATED))
        {
            return (false);
        }
        int tran = you.attribute[ATTR_TRANSFORMATION];
        if (tran == TRAN_STATUE || tran == TRAN_ICE_BEAST
            || tran == TRAN_AIR || tran == TRAN_LICH
            || tran == TRAN_SPIDER) // Monster spiders don't bleed either.
        {
            return (false);
        }
        return (true);
    }
    // Now check monsters.
    return (mons_has_blood(montype));

Replacement in crawl-ref/source/misc.cc at line 1175 [19.1933596]
∅:D[32.2807] → [27.7191:7227]
∅:D[33.38319] → [27.7191:7227]
B:BD[27.7191] → [27.7191:7227]
```
    if (!victim_can_bleed(montype))
```
[33.38319]
[27.7227]
```
    if (montype == -1 && !you.can_bleed())
```

Replacement in crawl-ref/source/misc.cc at line 1177 [19.1933596]

B:BD[27.7243] → [27.7243:7244]

[27.7243]

[34.3296]

    if (montype != -1)
    {
        monsters m;
        m.type = montype;
        if (!m.can_bleed())
            return;
    }

Replacement in crawl-ref/source/misc.cc at line 3091 [19.1933596]

B:BD[35.5704] → [35.5704:5774]

    const bool isUnchivalric = is_unchivalric_attack(&you, mon, mon);

[35.5704]

[35.5774]

    const bool isUnchivalric = is_unchivalric_attack(&you, mon);

Replacement in crawl-ref/source/fight.h at line 84 [19.3139131]

B:BD[36.3392] → [36.3392:3529]

                                              const actor *defender,
                                              const monsters *def);

[36.3392]

[37.24890]

                                              const actor *defender);

Deletion in crawl-ref/source/fight.h at line 89 [19.3139131]
B:BD[37.24921] → [37.24921:24985]
```
    // At the moment this only covers players fighting monsters
```

Replacement in crawl-ref/source/fight.h at line 91 [19.3139131]

B:BD[37.25022] → [37.25022:25112]

    // If attacker and/or defender are monsters, these are set.
    monsters  *atk, *def;

[37.25022]

[38.54416]

    monsters* attacker_as_monster()
    {
        return dynamic_cast<monsters*>(attacker);
    }
    monsters* defender_as_monster()
    {
        return dynamic_cast<monsters*>(defender);
    }

Replacement in crawl-ref/source/fight.h at line 184 [19.3139131]
B:BD[37.26756] → [38.54653:54693]
```
    void identify_mimic(monsters *mon);
```
[37.26756]
[37.26756]
```
    void identify_mimic(actor *mon);
```
Replacement in crawl-ref/source/fight.cc at line 68 [19.3140790]
B:BD[19.3143189] → [39.5384:5446]
```
static void stab_message(monsters *defender, int stab_bonus);
```
[19.3143189]
[19.3143313]
```
static void stab_message(actor *defender, int stab_bonus);
```

Replacement in crawl-ref/source/fight.cc at line 260 [19.3140790]

B:BD[36.3601] → [36.3601:3737]

                                              const actor *defender,
                                              const monsters *def)

[36.3601]

[36.3737]

                                              const actor *defender)

Insertion in crawl-ref/source/fight.cc at line 262 [19.3140790]

[36.3739]

    const monsters *def = (defender->atype() == ACT_PLAYER ? NULL :
                           dynamic_cast<const monsters*>(defender));

Deletion in crawl-ref/source/fight.cc at line 315 [19.3140790]
B:BD[37.30086] → [37.30086:30114]
```
      atk(NULL), def(NULL),
```
Deletion in crawl-ref/source/fight.cc at line 348 [19.3140790]
B:BD[37.30968] → [37.30968:31059]
∅:D[37.31059] → [40.881300:881301]
B:BD[40.881300] → [40.881300:881301]
B:BD[40.881301] → [37.31060:31163]
B:BD[37.31163] → [41.2984:2985]
```
    if (attacker->atype() == ACT_MONSTER)
        atk = dynamic_cast<monsters*>(attacker);
    if (defender && defender->atype() == ACT_MONSTER)
        def = dynamic_cast<monsters*>(defender);
```

Replacement in crawl-ref/source/fight.cc at line 483 [19.3140790]

B:BD[16.3002] → [16.3002:3045]

        return (def->flags & MF_BANISHED);

[16.3002]

[21.2643]

        return (dynamic_cast<const monsters*>(a)->flags & MF_BANISHED);

Replacement in crawl-ref/source/fight.cc at line 523 [19.3140790]
B:BD[40.881923] → [38.56873:56922]
```
void melee_attack::identify_mimic(monsters *mon)
```
[40.881923]
[38.56922]
```
void melee_attack::identify_mimic(actor *act)
```

Replacement in crawl-ref/source/fight.cc at line 525 [19.3140790]

B:BD[38.56924] → [38.56924:57022]

    if (mon && mons_is_mimic(mon->type)
        && mons_near(mon) && player_monster_visible(mon))

[38.56924]

[38.57022]

    if (act
        && act->atype() == ACT_MONSTER
        && mons_is_mimic(act->id())
        && you.can_see(act))

Insertion in crawl-ref/source/fight.cc at line 530 [19.3140790]
[38.57028]
[38.57028]
```
        monsters* mon = dynamic_cast<monsters*>(act);
```

Replacement in crawl-ref/source/fight.cc at line 538 [19.3140790]

B:BD[38.57145] → [38.57145:57195]

    identify_mimic(atk);
    identify_mimic(def);

[38.57145]

[42.3965]

    identify_mimic(attacker);
    identify_mimic(defender);

Replacement in crawl-ref/source/fight.cc at line 543 [19.3140790]

∅:D[43.6778] → [42.3966:4031]

B:BD[42.3966] → [42.3966:4031]

    if (attacker->atype() == ACT_PLAYER && attacker != defender)

[43.6778]

[42.4031]

    if (attacker->atype() == ACT_PLAYER && defender->atype() == ACT_MONSTER)

Replacement in crawl-ref/source/fight.cc at line 545 [19.3140790]

B:BD[42.4037] → [42.4037:4088]

        if (stop_attack_prompt(def, false, false))

[42.4037]

[42.4088]

        if (stop_attack_prompt(defender_as_monster(), false, false))

Replacement in crawl-ref/source/fight.cc at line 597 [19.3140790]

B:BD[44.2183] → [44.2183:2253]

B:BD[44.2253] → [45.9970:10006]

    if (defender->atype() == ACT_MONSTER && grid_is_solid(def->pos())
        && mons_wall_shielded(def))

[44.2183]

[44.2309]

    if (defender->atype() == ACT_MONSTER && grid_is_solid(defender->pos())
        && mons_wall_shielded(defender_as_monster()))

Replacement in crawl-ref/source/fight.cc at line 600 [19.3140790]

B:BD[44.2315] → [44.2315:2389]

        std::string feat_name = raw_feature_description(grd(def->pos()));

[44.2315]

[44.2389]

        std::string feat_name = raw_feature_description(grd(defender->pos()));

Replacement in crawl-ref/source/fight.cc at line 606 [19.3140790]
B:BD[44.2487] → [44.2487:2521]
```
            if (you.can_see(def))
```
[44.2487]
[44.2521]
```
            if (you.can_see(defender))
```

Replacement in crawl-ref/source/fight.cc at line 610 [19.3140790]

B:BD[44.2629] → [44.2629:2686]

                     def->name(DESC_NOCAP_THE).c_str());

[44.2629]

[44.2686]

                     defender->name(DESC_NOCAP_THE).c_str());

Replacement in crawl-ref/source/fight.cc at line 618 [19.3140790]
B:BD[44.2836] → [44.2836:2871]
```
        else if (you.can_see(atk))
```
[44.2836]
[44.2871]
```
        else if (you.can_see(attacker))
```

Replacement in crawl-ref/source/fight.cc at line 624 [19.3140790]

B:BD[44.3128] → [44.3128:3265]

            if (!mons_near(def))
                simple_monster_message(atk, " hits something");
            else if (!you.can_see(atk))

[44.3128]

[46.3320]

            if (!mons_near(defender_as_monster()))
            {
                simple_monster_message(attacker_as_monster(),
                                       " hits something");
            }
            else if (!you.can_see(attacker))

Replacement in crawl-ref/source/fight.cc at line 631 [19.3140790]

∅:D[46.3334] → [44.3265:3338]

B:BD[44.3265] → [44.3265:3338]

                mprf("%s hits the %s.", def->name(DESC_CAP_THE).c_str(),

[46.3334]

[44.3338]

                mprf("%s hits the %s.", defender->name(DESC_CAP_THE).c_str(),

Replacement in crawl-ref/source/fight.cc at line 637 [19.3140790]

B:BD[44.3470] → [44.3470:3580]

                     atk->name(DESC_CAP_THE).c_str(),
                     def->name(DESC_NOCAP_THE).c_str(),

[44.3470]

[44.3580]

                     attacker->name(DESC_CAP_THE).c_str(),
                     defender->name(DESC_NOCAP_THE).c_str(),

Replacement in crawl-ref/source/fight.cc at line 654 [19.3140790]

B:BD[42.4520] → [42.4520:4564]

        set_attack_conducts(conducts, def);

[42.4520]

[47.4071]

        set_attack_conducts(conducts, defender_as_monster());

Replacement in crawl-ref/source/fight.cc at line 667 [19.3140790]

B:BD[42.4900] → [42.4900:4971]

            if (attacker->atype() == ACT_PLAYER || mons_friendly(atk))

[42.4900]

[42.4971]

            if (attacker->atype() == ACT_PLAYER
                || mons_friendly(attacker_as_monster()))
            {

Insertion in crawl-ref/source/fight.cc at line 671 [19.3140790]
[42.5011]
[42.5011]
```
            }
```
Replacement in crawl-ref/source/fight.cc at line 728 [19.3140790]
B:BD[48.4395] → [10.3053:3084]
```
    if (mons_is_summoned(mon))
```
[48.4395]
[10.3084]
```
    if (mon->is_summoned())
```

Replacement in crawl-ref/source/fight.cc at line 744 [19.3140790]

B:BD[48.4837] → [48.4837:4911]

static bool _player_vampire_draws_blood(const int mons, const int damage,

[48.4837]

[48.4911]

static bool _player_vampire_draws_blood(const monsters* mon, const int damage,

Deletion in crawl-ref/source/fight.cc at line 748 [19.3140790]
B:BD[48.5021] → [48.5021:5045]
```
    ASSERT(mons != -1);
```
Deletion in crawl-ref/source/fight.cc at line 749 [19.3140790]
∅:D[49.2667] → [48.5050:5089]
B:BD[48.5050] → [48.5050:5089]
B:BD[48.5089] → [25.4613:4614]
```
    const monsters *mon = &menv[mons];
```
Replacement in crawl-ref/source/fight.cc at line 752 [19.3140790]
∅:D[25.4616] → [48.5173:5233]
B:BD[48.5173] → [48.5173:5233]
```
    const int chunk_type = mons_corpse_effect( mon->type );
```
[25.4616]
[48.5233]
```
    const int chunk_type = mons_corpse_effect(mon->type);
```

Replacement in crawl-ref/source/fight.cc at line 838 [19.3140790]

B:BD[50.873] → [50.873:950]

B:BD[50.950] → [51.2982:3046]

∅:D[51.3046] → [52.2643:2710]

B:BD[53.2755] → [52.2643:2710]

        if (you.religion == GOD_BEOGH && mons_species(def->type) == MONS_ORC
            && mons_is_sleeping(def) && !player_under_penance()
            && you.piety >= piety_breakpoint(2) && mons_near(def))

[50.873]

[50.1083]

        if (you.religion == GOD_BEOGH && defender->mons_species() == MONS_ORC
            && defender->asleep() && !player_under_penance()
            && you.piety >= piety_breakpoint(2)
            && mons_near(defender_as_monster()))

Replacement in crawl-ref/source/fight.cc at line 847 [19.3140790]
∅:D[32.3214] → [54.2714:2763]
B:BD[54.2714] → [54.2714:2763]
```
        behaviour_event(def, ME_WHACK, MHITYOU);
```
[32.3214]
[54.2763]
```
        behaviour_event(defender_as_monster(), ME_WHACK, MHITYOU);
```

Replacement in crawl-ref/source/fight.cc at line 849 [19.3140790]

B:BD[54.2764] → [32.3215:3309]

        if (damage_done > 0 && !mons_is_summoned(def)
            && !mons_is_submerged(def))

[54.2764]

[27.7703]

        if (damage_done > 0
            && !defender->is_summoned()
            && !defender->submerged())

Replacement in crawl-ref/source/fight.cc at line 884 [19.3140790]

B:BD[48.6961] → [48.6961:7041]

            _player_vampire_draws_blood(monster_index(def), damage_done, true);

[48.6961]

[48.7041]

            _player_vampire_draws_blood(defender_as_monster(),
                                        damage_done, true);

Replacement in crawl-ref/source/fight.cc at line 896 [19.3140790]
∅:D[55.11418] → [50.1323:1370]
B:BD[50.1323] → [50.1323:1370]
```
            beogh_follower_convert(def, true);
```
[55.11418]
[50.1370]
```
            beogh_follower_convert(defender_as_monster(), true);
```
Replacement in crawl-ref/source/fight.cc at line 910 [19.3140790]
B:BD[19.3150519] → [56.15338:15391]
```
    if ((did_primary_hit || did_hit) && def->alive()
```
[19.3150519]
[56.15391]
```
    if ((did_primary_hit || did_hit) && defender->alive()
```
Replacement in crawl-ref/source/fight.cc at line 913 [19.3140790]
B:BD[56.15434] → [7.2556:2583]
```
        print_wounds(def);
```
[56.15434]
[56.15435]
```
        print_wounds(defender_as_monster());
```

Replacement in crawl-ref/source/fight.cc at line 1156 [19.3140790]

B:BD[57.22475] → [48.7420:7477]

                if (_vamp_wants_blood_from_monster(def))

[57.22475]

[48.7477]

                if (_vamp_wants_blood_from_monster(defender_as_monster()))

Replacement in crawl-ref/source/fight.cc at line 1192 [19.3140790]

B:BD[58.6623] → [58.6623:6748]

        if (you.religion != GOD_ELYVILON && you.penance[GOD_ELYVILON]
            && to_hit >= def->ev && one_chance_in(20))

[58.6623]

[58.6748]

        const int evasion = defender->melee_evasion(attacker);
        if (you.religion != GOD_ELYVILON
            && you.penance[GOD_ELYVILON]
            && to_hit >= evasion
            && one_chance_in(20))

Replacement in crawl-ref/source/fight.cc at line 1202 [19.3140790]
∅:D[25.4795] → [58.6877:6945]
B:BD[58.6877] → [58.6877:6945]
```
        if (!ely_block && (to_hit >= def->ev || one_chance_in(30)))
```
[25.4795]
[19.3157277]
```
        if (!ely_block && (to_hit >= evasion || one_chance_in(30)))
```

Replacement in crawl-ref/source/fight.cc at line 1205 [19.3140790]

B:BD[6.2566] → [6.2566:2619]

            behaviour_event(def, ME_WHACK, MHITYOU);

[6.2566]

[6.2619]

            behaviour_event(defender_as_monster(), ME_WHACK, MHITYOU);

Replacement in crawl-ref/source/fight.cc at line 1228 [19.3140790]

B:BD[58.6995] → [58.6995:7069]

                dec_penance(GOD_ELYVILON, 1 + random2(to_hit - def->ev));

[58.6995]

[19.3157694]

                dec_penance(GOD_ELYVILON, 1 + random2(to_hit - evasion));

Replacement in crawl-ref/source/fight.cc at line 1254 [19.3140790]

B:BD[19.3158329] → [59.6004:6072]

    aux_damage  = def->hurt(&you, aux_damage, BEAM_MISSILE, false);

[19.3158329]

[60.790]

    aux_damage  = defender->hurt(&you, aux_damage, BEAM_MISSILE, false);

Replacement in crawl-ref/source/fight.cc at line 1268 [19.3140790]

B:BD[37.42014] → [61.3711:3752]

            poison_monster(def, KC_YOU);

[37.42014]

[62.3193]

            poison_monster(defender_as_monster(), KC_YOU);

Replacement in crawl-ref/source/fight.cc at line 1274 [19.3140790]

B:BD[63.1577] → [48.8351:8425]

            _player_vampire_draws_blood(monster_index(def), damage_done);

[63.1577]

[63.3062]

            _player_vampire_draws_blood(defender_as_monster(), damage_done);

Replacement in crawl-ref/source/fight.cc at line 1282 [19.3140790]

B:BD[37.42319] → [64.6685:6756]

             player_monster_visible(def) ? ", but do no damage" : "");

[37.42319]

[19.3158868]

             you.can_see(defender) ? ", but do no damage" : "");

Replacement in crawl-ref/source/fight.cc at line 1285 [19.3140790]

∅:D[25.4799] → [37.42420:42449]

B:BD[37.42420] → [37.42420:42449]

B:BD[37.42449] → [65.21698:21748]

    if (def->hit_points < 1)
        _monster_die(def, KILL_YOU, NON_MONSTER);

[25.4799]

[19.3159025]

    if (defender_as_monster()->hit_points < 1)
        _monster_die(defender_as_monster(), KILL_YOU, NON_MONSTER);

Replacement in crawl-ref/source/fight.cc at line 1288 [19.3140790]
B:BD[19.3159026] → [59.6073:6101]
```
    return (!def->alive());
```
[19.3159026]
[37.42533]
```
    return (!defender->alive());
```

Replacement in crawl-ref/source/fight.cc at line 1333 [19.3140790]

B:BD[66.11706] → [67.2949:2994]

                << def->name(DESC_NOCAP_THE)

[66.11706]

[66.11757]

                << defender->name(DESC_NOCAP_THE)

Replacement in crawl-ref/source/fight.cc at line 1341 [19.3140790]

B:BD[37.43557] → [38.57250:57306]

    if ((to_hit + heavy_armour_penalty / 2) >= def->ev)

[37.43557]

[37.43618]

    if ((to_hit + heavy_armour_penalty/2) >= defender->melee_evasion(attacker))

Replacement in crawl-ref/source/fight.cc at line 1352 [19.3140790]

B:BD[68.2867] → [51.3047:3128]

    if (!mons_is_sleeping(def))
        behaviour_event(def, ME_WHACK, MHITYOU);

[68.2867]

[19.3160141]

    if (!defender->asleep())
        behaviour_event(defender_as_monster(), ME_WHACK, MHITYOU);

Replacement in crawl-ref/source/fight.cc at line 1356 [19.3140790]

B:BD[69.316] → [67.2995:3040]

                << def->name(DESC_NOCAP_THE)

[69.316]

[69.367]

                << defender->name(DESC_NOCAP_THE)

Insertion in crawl-ref/source/fight.cc at line 1363 [19.3140790]
[37.44063]
[19.3160222]
```
    const int evasion = defender->melee_evasion(attacker);
```

Replacement in crawl-ref/source/fight.cc at line 1365 [19.3140790]

B:BD[19.3160244] → [49.2713:2778]

∅:D[49.2778] → [38.57307:57336]

B:BD[37.44130] → [38.57307:57336]

    mprf( MSGCH_DIAGNOSTICS, "your to-hit: %d; defender EV: %d",
          to_hit, def->ev );

[19.3160244]

[19.3160283]

    mprf(MSGCH_DIAGNOSTICS, "your to-hit: %d; defender effective EV: %d",
         to_hit, evasion);

Replacement in crawl-ref/source/fight.cc at line 1369 [19.3140790]
B:BD[19.3160291] → [38.57337:57367]
```
    return (to_hit >= def->ev
```
[19.3160291]
[70.156]
```
    return (to_hit >= evasion
```

Replacement in crawl-ref/source/fight.cc at line 1371 [19.3140790]

B:BD[70.189] → [51.3129:3193]

            || ((mons_cannot_act(def) || mons_is_sleeping(def))

[70.189]

[71.7673]

            || ((defender->cannot_act() || defender->asleep())

Replacement in crawl-ref/source/fight.cc at line 1373 [19.3140790]

B:BD[71.7738] → [71.7738:7777]

            || mons_is_petrifying(def)

[71.7738]

[71.7777]

            || mons_is_petrifying(defender_as_monster())

Replacement in crawl-ref/source/fight.cc at line 1558 [19.3140790]
∅:D[68.2909] → [37.48594:48635]
B:BD[37.48594] → [37.48594:48635]
```
        stab_message( def, stab_bonus );
```
[68.2909]
[19.3163052]
```
        stab_message(defender, stab_bonus);
```
Replacement in crawl-ref/source/fight.cc at line 1577 [19.3140790]
B:BD[72.2663] → [51.3233:3268]
```
        if (mons_is_sleeping(def))
```
[72.2663]
[37.49229]
```
        if (defender->asleep())
```

Replacement in crawl-ref/source/fight.cc at line 1582 [19.3140790]

B:BD[19.3163334] → [73.2026:2077]

                int stun = random2( you.dex + 1 );

[19.3163334]

[72.2664]

                int stun = random2(you.dex + 1);

Replacement in crawl-ref/source/fight.cc at line 1584 [19.3140790]

∅:D[72.2665] → [37.49455:49554]

B:BD[37.49455] → [37.49455:49554]

                if (def->speed_increment > stun)
                    def->speed_increment -= stun;

[72.2665]

[37.49554]

                if (defender_as_monster()->speed_increment > stun)
                    defender_as_monster()->speed_increment -= stun;

Replacement in crawl-ref/source/fight.cc at line 1587 [19.3140790]

B:BD[37.49575] → [37.49575:49621]

                    def->speed_increment = 0;

[37.49575]

[19.3163686]

                    defender_as_monster()->speed_increment = 0;

Replacement in crawl-ref/source/fight.cc at line 1602 [19.3140790]
∅:D[68.3103] → [38.57368:57393]
B:BD[37.49844] → [38.57368:57393]
```
        if (def->ac > 0)
```
[68.3103]
[19.3164168]
```
        if (defender->armour_class() > 0)
```

Replacement in crawl-ref/source/fight.cc at line 1604 [19.3140790]

B:BD[19.3164178] → [74.277:312]

∅:D[74.312] → [37.49919:49986]

∅:D[38.57423] → [37.49919:49986]

B:BD[37.49919] → [37.49919:49986]

            const int ac = def->ac
                - random2( you.skills[SK_STABBING] / stab_bonus );

[19.3164178]

[49.2787]

            const int ac = defender->armour_class()
                - random2(you.skills[SK_STABBING] / stab_bonus);

Replacement in crawl-ref/source/fight.cc at line 1614 [19.3140790]

∅:D[68.3134] → [38.57424:57493]

B:BD[37.50117] → [38.57424:57493]

        if (def->ac > 0)
            damage -= random2(1 + def->ac);

[68.3134]

[37.50206]

        if (defender->armour_class() > 0)
            damage -= random2(1 + defender->armour_class());

Replacement in crawl-ref/source/fight.cc at line 1618 [19.3140790]
B:BD[19.3164365] → [68.3135:3167]
```
    if (mons_is_petrified(def))
```
[19.3164365]
[68.3167]
```
    if (mons_is_petrified(defender_as_monster()))
```

Replacement in crawl-ref/source/fight.cc at line 1785 [19.3140790]

B:BD[37.54009] → [59.6102:6246]

    return damage_done && (damage_done = def->hurt(&you, damage_done,
                                                   BEAM_MISSILE, false));

[37.54009]

[37.54067]

    return damage_done && (damage_done = defender->hurt(&you, damage_done,
                                                        BEAM_MISSILE, false));

Replacement in crawl-ref/source/fight.cc at line 1848 [19.3140790]

B:BD[48.8774] → [48.8774:8853]

        && _player_vampire_draws_blood(monster_index(def), damage_done, true))

[48.8774]

[48.8853]

        && _player_vampire_draws_blood(defender_as_monster(),
                                       damage_done, true))

Replacement in crawl-ref/source/fight.cc at line 1858 [19.3140790]
B:BD[75.551] → [17.3855:3893]
```
            && !mons_is_summoned(def)
```
[75.551]
[76.672]
```
            && !defender->is_summoned()
```
Replacement in crawl-ref/source/fight.cc at line 1926 [19.3140790]
B:BD[38.57659] → [59.6247:6301]
```
    special_damage = def->hurt(&you, special_damage);
```
[38.57659]
[19.3169681]
```
    special_damage = defender->hurt(&you, special_damage);
```
Replacement in crawl-ref/source/fight.cc at line 1928 [19.3140790]
B:BD[19.3169682] → [59.6302:6330]
```
    return (!def->alive());
```
[19.3169682]
[65.21749]
```
    return (!defender->alive());
```

Replacement in crawl-ref/source/fight.cc at line 2086 [19.3140790]

B:BD[16.3085] → [16.3085:3139]

        def->hit_dice--;
        def->experience = 0;

[16.3085]

[77.4495]

        defender_as_monster()->hit_dice--;
        defender_as_monster()->experience = 0;

Replacement in crawl-ref/source/fight.cc at line 2090 [19.3140790]

B:BD[16.3141] → [16.3141:3242]

    def->max_hit_points -= 2 + random2(3);
    def->hurt(attacker, 2 + random2(3), BEAM_NEG, false);

[16.3141]

[25.4934]

    defender_as_monster()->max_hit_points -= 2 + random2(3);
    defender->hurt(attacker, 2 + random2(3), BEAM_NEG, false);

Replacement in crawl-ref/source/fight.cc at line 2189 [19.3140790]

B:BD[78.9358] → [79.3092:3211]

        defender->banish(atk ? atk->name(DESC_PLAIN, true)
                             : attacker->name(DESC_PLAIN));

[78.9358]

[80.4215]

        defender->banish(attacker->name(DESC_PLAIN, true));

Replacement in crawl-ref/source/fight.cc at line 2219 [19.3140790]

B:BD[65.25834] → [65.25834:25955]

B:BD[65.26012] → [81.2620:2731]

    const bool immune     = mon && mons_immune_magic(def);
    const bool is_shifter = mon && mons_is_shapeshifter(def);
    const bool can_clone  = mon && !mons_is_holy(def)
                            && mons_clonable(def, true);

[65.25834]

[65.26087]

    const bool immune     = mon && mons_immune_magic(defender_as_monster());
    const bool is_shifter = mon && mons_is_shapeshifter(defender_as_monster());
    const bool can_clone  = mon && !mons_is_holy(defender_as_monster())
                            && mons_clonable(defender_as_monster(), true);

Replacement in crawl-ref/source/fight.cc at line 2254 [19.3140790]

B:BD[8.3101] → [8.3101:3170]

                simple_monster_message(def, " gives off a flash of "

[8.3101]

[8.3170]

                simple_monster_message(defender_as_monster(),
                                       " gives off a flash of "

Replacement in crawl-ref/source/fight.cc at line 2292 [19.3140790]

B:BD[81.2740] → [43.8286:8350]

        int clone_idx = clone_mons(def, true, &obvious_effect);

[81.2740]

[81.2805]

        int clone_idx = clone_mons(defender_as_monster(), true,
                                   &obvious_effect);

Replacement in crawl-ref/source/fight.cc at line 2303 [19.3140790]

B:BD[81.2977] → [81.2977:3054]

            if (clone.attitude == ATT_FRIENDLY && !mons_is_summoned(&clone))

[81.2977]

[81.3054]

            if (clone.attitude == ATT_FRIENDLY && !clone.is_summoned())

Replacement in crawl-ref/source/fight.cc at line 2319 [19.3140790]

B:BD[65.27872] → [9.2620:2678]

        monster_polymorph(def, RANDOM_MONSTER, PPT_MORE);

[65.27872]

[65.27936]

        monster_polymorph(defender_as_monster(), RANDOM_MONSTER, PPT_MORE);

Replacement in crawl-ref/source/fight.cc at line 2328 [19.3140790]
B:BD[65.28136] → [65.28136:28177]
```
        def->add_ench(one_chance_in(3) ?
```
[65.28136]
[65.28177]
```
        defender_as_monster()->add_ench(one_chance_in(3) ?
```

Replacement in crawl-ref/source/fight.cc at line 2331 [19.3140790]

B:BD[65.28312] → [65.28312:28376]

        monster_polymorph(def, RANDOM_MONSTER, PPT_SAME, true);

[65.28312]

[43.8692]

        monster_polymorph(defender_as_monster(),
                          RANDOM_MONSTER, PPT_SAME, true);

Replacement in crawl-ref/source/fight.cc at line 2411 [19.3140790]

B:BD[65.29226] → [65.29226:29294]

B:BD[65.29294] → [82.2820:2889]

∅:D[82.2889] → [65.29363:29508]

B:BD[65.29363] → [65.29363:29508]

        beam.thrower = (attacker->atype() == ACT_PLAYER) ? KILL_YOU
                            : atk->confused_by_you() ? KILL_YOU_CONF
                            : KILL_MON;
        beam.beam_source =
            (attacker->atype() == ACT_PLAYER) ? MHITYOU : monster_index(atk);

[65.29226]

[65.29508]

        beam.thrower =
            (attacker->atype() == ACT_PLAYER)          ? KILL_YOU
            : attacker_as_monster()->confused_by_you() ? KILL_YOU_CONF
                                                       : KILL_MON;
        beam.beam_source = attacker->mindex();

Replacement in crawl-ref/source/fight.cc at line 2868 [19.3140790]

B:BD[83.5757] → [83.5757:5823]

                old_poison = (def->get_ench(ENCH_POISON)).degree;

[83.5757]

[78.9554]

                old_poison =
                    (defender_as_monster()->get_ench(ENCH_POISON)).degree;

Replacement in crawl-ref/source/fight.cc at line 2881 [19.3140790]

B:BD[83.5938] → [83.5938:6010]

                   && old_poison < (def->get_ench(ENCH_POISON)).degree)

[83.5938]

[78.9666]

                   && old_poison <
                      (defender_as_monster()->get_ench(ENCH_POISON)).degree)

Replacement in crawl-ref/source/fight.cc at line 2905 [19.3140790]

B:BD[48.9323] → [48.9323:9397]

            _player_vampire_draws_blood(monster_index(def), damage_done);

[48.9323]

[48.9397]

            _player_vampire_draws_blood(defender_as_monster(), damage_done);

Replacement in crawl-ref/source/fight.cc at line 2985 [19.3140790]

B:BD[25.4951] → [77.5046:5094]

        if (mons_class_is_confusable(def->type)

[25.4951]

[77.5094]

        if (mons_class_is_confusable(defender->id())

Replacement in crawl-ref/source/fight.cc at line 2993 [19.3140790]

B:BD[84.26446] → [84.26446:26482]

B:BD[84.26482] → [64.6757:6889]

B:BD[64.6889] → [85.4607:4664]

            beam_temp.beam_source =
                (attacker->atype() == ACT_PLAYER) ? MHITYOU
                                                  : monster_index(atk);
            beam_temp.apply_enchantment_to_monster(def);

[84.26446]

[65.31343]

            beam_temp.beam_source = attacker->mindex();
            beam_temp.apply_enchantment_to_monster(defender_as_monster());

Replacement in crawl-ref/source/fight.cc at line 3076 [19.3140790]

B:BD[21.5675] → [86.3008:3065]

        if (def->number == 1) // will be zero afterwards

[21.5675]

[21.5704]

        if (defender_as_monster()->number == 1) // will be zero afterwards

Replacement in crawl-ref/source/fight.cc at line 3085 [19.3140790]
B:BD[27.7959] → [86.3066:3093]
```
            def->number--;
```
[27.7959]
[21.5968]
```
            defender_as_monster()->number--;
```

Replacement in crawl-ref/source/fight.cc at line 3087 [19.3140790]

B:BD[21.5969] → [27.7960:8005]

B:BD[27.8005] → [32.3310:3350]

B:BD[32.3350] → [33.43641:43719]

            coord_def pos = defender->pos();
            if (!mons_is_summoned(def))
                bleed_onto_floor(pos, defender->id(), def->hit_points, true);

[21.5969]

[87.2858]

            if (!defender->is_summoned())
                bleed_onto_floor(defender->pos(), defender->id(),
                                 defender_as_monster()->hit_points, true);

Replacement in crawl-ref/source/fight.cc at line 3091 [19.3140790]
∅:D[87.2859] → [21.5969:6024]
∅:D[27.8147] → [21.5969:6024]
B:BD[21.5969] → [21.5969:6024]
```
            defender->hurt(attacker, def->hit_points);
```
[87.2859]
[21.6024]
```
            defender->hurt(attacker, defender_as_monster()->hit_points);
```
Replacement in crawl-ref/source/fight.cc at line 3102 [19.3140790]
B:BD[77.5356] → [86.3094:3121]
```
            def->number--;
```
[77.5356]
[19.3176453]
```
            defender_as_monster()->number--;
```

Replacement in crawl-ref/source/fight.cc at line 3108 [19.3140790]

B:BD[15.6520] → [15.6520:6574]

                if (def->type == MONS_LERNAEAN_HYDRA)

[15.6520]

[15.6574]

                if (defender->id() == MONS_LERNAEAN_HYDRA)

Replacement in crawl-ref/source/fight.cc at line 3117 [19.3140790]

B:BD[88.45715] → [15.6608:6658]

                else if (def->number < limit - 1)

[88.45715]

[88.45758]

                else if (defender_as_monster()->number < limit - 1)

Replacement in crawl-ref/source/fight.cc at line 3119 [19.3140790]

B:BD[88.45776] → [88.45776:45948]

                    simple_monster_message( def, " grows two more!" );
                    def->number += 2;
                    heal_monster( def, 8 + random2(8), true );

[88.45776]

[88.45948]

                    simple_monster_message(defender_as_monster(),
                                           " grows two more!" );
                    defender_as_monster()->number += 2;
                    heal_monster(defender_as_monster(), 8 + random2(8), true);

Replacement in crawl-ref/source/fight.cc at line 3134 [19.3140790]

B:BD[3.2702] → [3.2702:2743]

        && def->has_hydra_multi_attack()

[3.2702]

[3.2743]

        && defender_as_monster()->has_hydra_multi_attack()

Replacement in crawl-ref/source/fight.cc at line 3258 [19.3140790]

B:BD[37.66485] → [89.30073:30114]

            poison_monster(def, KC_YOU);

[37.66485]

[37.66524]

            poison_monster(defender_as_monster(), KC_YOU);

Replacement in crawl-ref/source/fight.cc at line 3264 [19.3140790]
B:BD[37.66572] → [90.2953:2996]
```
        if (mons_res_negative_energy(def))
```
[37.66572]
[37.66619]
```
        if (defender->res_negative_energy())
```
Replacement in crawl-ref/source/fight.cc at line 3313 [19.3140790]
B:BD[37.67803] → [37.67803:67832]
```
    if (def->hit_points < 1)
```
[37.67803]
[37.67832]
```
    if (!defender->alive())
```

Replacement in crawl-ref/source/fight.cc at line 3322 [19.3140790]

B:BD[19.3183781] → [65.32158:32208]

        _monster_die(def, KILL_YOU, NON_MONSTER);

[19.3183781]

[19.3183992]

        _monster_die(defender_as_monster(), KILL_YOU, NON_MONSTER);

Replacement in crawl-ref/source/fight.cc at line 3525 [19.3140790]

B:BD[91.2658] → [91.2658:2707]

        else if (def->invisible() && !see_invis)

[91.2658]

[91.2707]

        else if (defender->invisible() && !see_invis)

Replacement in crawl-ref/source/fight.cc at line 3534 [19.3140790]

B:BD[37.73485] → [36.4917:4959]

B:BD[36.4959] → [92.2661:2713]

    unchivalric_attack_type unchivalric =
        is_unchivalric_attack(&you, defender, def);

[37.73485]

[36.5015]

    unchivalric_attack_type unchivalric = is_unchivalric_attack(&you, defender);

Replacement in crawl-ref/source/fight.cc at line 3562 [19.3140790]
∅:D[64.7115] → [93.353:389]
B:BD[74.413] → [93.353:389]
```
        if (!mons_sense_invis(def))
```
[64.7115]
[94.298]
```
        if (!mons_sense_invis(defender_as_monster()))
```

Replacement in crawl-ref/source/fight.cc at line 3783 [19.3140790]

B:BD[37.79319] → [42.5028:5112]

    const coord_def atk_pos = atk->pos();
    const coord_def def_pos = def->pos();

[37.79319]

[42.5112]

    const coord_def atk_pos = attacker->pos();
    const coord_def def_pos = defender->pos();

Replacement in crawl-ref/source/fight.cc at line 3787 [19.3140790]

B:BD[42.5158] → [33.43720:43792]

    if ((is_sanctuary(atk_pos) || is_sanctuary(def_pos)) && atk != def)

[42.5158]

[42.5273]

    if ((is_sanctuary(atk_pos) || is_sanctuary(def_pos))
        && attacker != defender)

Replacement in crawl-ref/source/fight.cc at line 3792 [19.3140790]
∅:D[95.2783] → [42.5394:5426]
B:BD[42.5394] → [42.5394:5426]
```
        if (mons_friendly(atk))
```
[95.2783]
[42.5426]
```
        if (mons_friendly(attacker_as_monster()))
```

Replacement in crawl-ref/source/fight.cc at line 3796 [19.3140790]

B:BD[42.5522] → [42.5522:5579]

                if (atk->confused() && you.can_see(atk))

[42.5522]

[5.2667]

                if (attacker->confused() && you.can_see(attacker))

Replacement in crawl-ref/source/fight.cc at line 3801 [19.3140790]

∅:D[5.2704] → [42.5711:5785]

B:BD[42.5711] → [42.5711:5785]

                else if (atk->has_ench(ENCH_BERSERK) && you.can_see(atk))

[5.2704]

[5.2705]

                else if (attacker_as_monster()->has_ench(ENCH_BERSERK)
                         && you.can_see(attacker))

Replacement in crawl-ref/source/fight.cc at line 3826 [19.3140790]

∅:D[96.3137] → [38.63824:63894]

B:BD[38.63824] → [38.63824:63894]

B:BD[38.63894] → [2.280:321]

    if (perceived_attack && (def->foe == MHITNOT || one_chance_in(3))
        && atk->alive() && def->alive())

[96.3137]

[37.79584]

    if (perceived_attack
        && (defender_as_monster()->foe == MHITNOT || one_chance_in(3))
        && attacker->alive() && defender->alive())

Replacement in crawl-ref/source/fight.cc at line 3830 [19.3140790]

B:BD[37.79590] → [97.882:942]

        behaviour_event(def, ME_WHACK, monster_index(atk));

[37.79590]

[96.3138]

        behaviour_event(defender_as_monster(), ME_WHACK, attacker->mindex());

Replacement in crawl-ref/source/fight.cc at line 3836 [19.3140790]

∅:D[95.2982] → [96.3233:3296]

∅:D[42.6380] → [96.3233:3296]

∅:D[98.13533] → [96.3233:3296]

B:BD[96.3233] → [96.3233:3296]

B:BD[96.3296] → [42.6381:6444]

    if (perceived_attack && atk->alive() && mons_friendly(def)
        && !mons_wont_attack(atk) && you.pet_target == MHITNOT

[95.2982]

[42.6444]

    if (perceived_attack && attacker->alive()
        && mons_friendly(defender_as_monster())
        && !mons_wont_attack(attacker_as_monster())
        && you.pet_target == MHITNOT

Replacement in crawl-ref/source/fight.cc at line 3842 [19.3140790]
B:BD[96.3366] → [96.3366:3411]
```
        you.pet_target = monster_index(atk);
```
[96.3366]
[37.79636]
```
        you.pet_target = attacker->mindex();
```

Replacement in crawl-ref/source/fight.cc at line 3850 [19.3140790]

B:BD[99.8553] → [38.64025:64100]

    if (atk->type == MONS_GIANT_SPORE || atk->type == MONS_BALL_LIGHTNING)

[99.8553]

[99.8626]

    if (attacker->id() == MONS_GIANT_SPORE
        || attacker->id() == MONS_BALL_LIGHTNING)

Replacement in crawl-ref/source/fight.cc at line 3853 [19.3140790]
B:BD[99.8632] → [38.64101:64131]
```
        atk->hit_points = -1;
```
[99.8632]
[14.2819]
```
        attacker_as_monster()->hit_points = -1;
```

Replacement in crawl-ref/source/fight.cc at line 3855 [19.3140790]

B:BD[14.2858] → [14.2858:2909]

        monster_die(atk, KILL_MON, atk->mindex());

[14.2858]

[38.64131]

        monster_die(attacker_as_monster(), KILL_MON, attacker->mindex());

Replacement in crawl-ref/source/fight.cc at line 3866 [19.3140790]

B:BD[38.64800] → [38.64800:64886]

        && mons_is_summoned(atk)
        && !check_mons_resist_magic( atk, warding ))

[38.64800]

[19.3202290]

        && attacker->is_summoned()
        && !check_mons_resist_magic(attacker_as_monster(), warding))

Replacement in crawl-ref/source/fight.cc at line 3938 [19.3140790]

B:BD[38.66383] → [38.66383:66434]

            && mons_species(atk->type) == MONS_ORC

[38.66383]

[38.66434]

            && attacker->mons_species() == MONS_ORC

Replacement in crawl-ref/source/fight.cc at line 3956 [19.3140790]
B:BD[100.10796] → [100.10796:10833]
```
    if (atk->has_ench(ENCH_BERSERK))
```
[100.10796]
[100.10833]
```
    if (attacker_as_monster()->has_ench(ENCH_BERSERK))
```
Replacement in crawl-ref/source/fight.cc at line 3958 [19.3140790]
B:BD[100.10866] → [101.3903:3951]
```
    else if (atk->has_ench(ENCH_BATTLE_FRENZY))
```
[100.10866]
[101.3951]
```
    else if (attacker_as_monster()->has_ench(ENCH_BATTLE_FRENZY))
```

Replacement in crawl-ref/source/fight.cc at line 3960 [19.3140790]

B:BD[101.3957] → [101.3957:4025]

        const mon_enchant ench = atk->get_ench(ENCH_BATTLE_FRENZY);

[101.3957]

[25.5094]

        const mon_enchant ench =
            attacker_as_monster()->get_ench(ENCH_BATTLE_FRENZY);

Replacement in crawl-ref/source/fight.cc at line 4233 [19.3140790]

B:BD[102.4601] → [13.6378:6516]

∅:D[13.6516] → [102.4678:4751]

B:BD[102.4678] → [102.4678:4751]

            napalm_monster(def, mons_friendly_real(atk) ? KC_FRIENDLY
                                                        : KC_OTHER,
                           std::min(4, 1 + random2(atk->hit_dice) / 2));

[102.4601]

[102.4751]

            napalm_monster(defender_as_monster(),
                           mons_friendly_real(attacker_as_monster()) ?
                           KC_FRIENDLY : KC_OTHER,
                           std::min(4, 1 + random2(attacker->get_experience_level())/2));

Replacement in crawl-ref/source/fight.cc at line 4322 [19.3140790]

B:BD[38.72827] → [38.72827:72905]

        if (atk->type == MONS_FIRE_VORTEX)
            atk->hit_points = -10;

[38.72827]

[19.3236227]

        if (attacker->id() == MONS_FIRE_VORTEX)
            attacker_as_monster()->hit_points = -10;

Replacement in crawl-ref/source/fight.cc at line 4329 [19.3140790]

∅:D[84.27500] → [38.72986:73060]

B:BD[38.72986] → [38.72986:73060]

                                 atk->hit_dice + random2(atk->hit_dice));

[84.27500]

[77.6287]

                                 attacker->get_experience_level()
                                 + random2(attacker->get_experience_level()));

Replacement in crawl-ref/source/fight.cc at line 4348 [19.3140790]

B:BD[84.27599] → [103.2675:2753]

                                 atk->hit_dice + random2(2 * atk->hit_dice));

[84.27599]

[77.6311]

                                 attacker->get_experience_level() +
                                 random2(2 * attacker->get_experience_level()));

Replacement in crawl-ref/source/fight.cc at line 4366 [19.3140790]

B:BD[104.378] → [103.2754:2815]

                atk->hit_dice + random2(atk->hit_dice / 2));

[104.378]

[104.441]

                attacker->get_experience_level() +
                random2(attacker->get_experience_level() / 2));

Replacement in crawl-ref/source/fight.cc at line 4388 [19.3140790]

B:BD[64.7310] → [105.2754:2823]

∅:D[105.2823] → [25.5304:5410]

B:BD[25.5304] → [25.5304:5410]

        if (defender->atype() == ACT_PLAYER && !victim_can_bleed(-1)
            || defender->atype() == ACT_MONSTER
               && !victim_can_bleed(def->type))
        {

[64.7310]

[25.5410]

        if (!defender->can_bleed())

Deletion in crawl-ref/source/fight.cc at line 4390 [19.3140790]
B:BD[25.5429] → [25.5429:5439]
```
        }
```

Replacement in crawl-ref/source/fight.cc at line 4393 [19.3140790]

B:BD[64.7421] → [106.3416:3487]

        if (defender->atype() == ACT_MONSTER && mons_is_summoned(def))

[64.7421]

[64.7456]

        if (defender->is_summoned())

Replacement in crawl-ref/source/fight.cc at line 4464 [19.3140790]

B:BD[19.3243287] → [38.76241:76317]

            if (--atk->hit_dice <= 0)
                atk->hit_points = -1;

[19.3243287]

[19.3243942]

            if (--(attacker_as_monster()->hit_dice) <= 0)
                attacker_as_monster()->hit_points = -1;

Replacement in crawl-ref/source/fight.cc at line 4478 [19.3140790]

B:BD[38.76632] → [11.6321:6394]

            defender->confuse(attacker, 1 + random2(3 + atk->hit_dice));

[38.76632]

[38.76699]

            defender->confuse(attacker,
                              1 + random2(3+attacker->get_experience_level()));

Replacement in crawl-ref/source/fight.cc at line 4550 [19.3140790]

B:BD[38.77415] → [107.3436:3514]

    const int nrounds      = atk->has_hydra_multi_attack() ? atk->number : 4;

[38.77415]

[107.3514]

    const int nrounds = attacker_as_monster()->has_hydra_multi_attack() ?
        attacker_as_monster()->number : 4;

Replacement in crawl-ref/source/fight.cc at line 4556 [19.3140790]
B:BD[108.21490] → [108.21490:21521]
```
    atk->wield_melee_weapon();
```
[108.21490]
[109.56995]
```
    attacker_as_monster()->wield_melee_weapon();
```

Replacement in crawl-ref/source/fight.cc at line 4571 [19.3140790]

∅:D[25.5446] → [38.78004:78078]

B:BD[38.78004] → [38.78004:78078]

        const mon_attack_def attk = mons_attack_spec(atk, attack_number);

[25.5446]

[38.78078]

        const mon_attack_def attk = mons_attack_spec(attacker_as_monster(),
                                                     attack_number);

Replacement in crawl-ref/source/fight.cc at line 4578 [19.3140790]

B:BD[109.57043] → [110.2551:2597]

                atk->lose_energy(EUT_ATTACK);

[109.57043]

[109.57328]

                attacker_as_monster()->lose_energy(EUT_ATTACK);

Replacement in crawl-ref/source/fight.cc at line 4599 [19.3140790]

B:BD[65.32724] → [65.32724:32767]

            def_copy = new monsters(*def);

[65.32724]

[65.32767]

            def_copy = new monsters(*defender_as_monster());

Replacement in crawl-ref/source/fight.cc at line 4605 [19.3140790]

B:BD[19.3247934] → [38.78372:78445]

        mons_lose_attack_energy(atk, final_attack_delay, attack_number);

[19.3247934]

[19.3248327]

        mons_lose_attack_energy(attacker_as_monster(),
                                final_attack_delay, attack_number);

Replacement in crawl-ref/source/fight.cc at line 4659 [19.3140790]

B:BD[19.3250307] → [27.8148:8274]

            int type = -1; // player
            if (defender->atype() == ACT_MONSTER)
                type = defender->id();

[19.3250307]

[27.8274]

            const int type = defender->id();

Replacement in crawl-ref/source/fight.cc at line 4661 [19.3140790]

B:BD[27.8275] → [32.3499:3580]

            if (type == -1 || !mons_is_summoned(def) && !mons_is_submerged(def))

[27.8275]

[32.3580]

            if (defender->can_bleed()
                && !defender->is_summoned()
                && !defender->submerged())

Replacement in crawl-ref/source/fight.cc at line 4773 [19.3140790]

B:BD[111.2662] → [111.2662:2718]

B:BD[111.2718] → [65.33343:33398]

        item_def *weap = atk->mslot_item(MSLOT_WEAPON);
        if (weap && you.can_see(atk) && weap->cursed()

[111.2662]

[65.33398]

        item_def *weap = attacker_as_monster()->mslot_item(MSLOT_WEAPON);
        if (weap && you.can_see(attacker) && weap->cursed()

Replacement in crawl-ref/source/fight.cc at line 4818 [19.3140790]

B:BD[38.81255] → [38.81255:81308]

        interrupt_activity(AI_MONSTER_ATTACKS, atk);

[38.81255]

[25.5459]

        interrupt_activity(AI_MONSTER_ATTACKS, attacker_as_monster());

Replacement in crawl-ref/source/fight.cc at line 4824 [19.3140790]
∅:D[42.6756] → [38.81434:81483]
B:BD[38.81434] → [38.81434:81483]
```
            you.pet_target = monster_index(atk);
```
[42.6756]
[38.81483]
```
            you.pet_target = attacker->mindex();
```

Replacement in crawl-ref/source/fight.cc at line 4837 [19.3140790]

B:BD[38.81652] → [112.7412:7534]

    const int hd_mult = mons_class_flag(atk->type, M_FIGHTER)? 25 : 15;
    int mhit = 18 + atk->hit_dice * hd_mult / 10;

[38.81652]

[113.3146]

    const int hd_mult = mons_class_flag(attacker->id(), M_FIGHTER)? 25 : 15;
    int mhit = 18 + attacker->get_experience_level() * hd_mult / 10;

Replacement in crawl-ref/source/fight.cc at line 5121 [19.3140790]
B:BD[19.3268779] → [39.5447:5510]
```
static void stab_message( monsters *defender, int stab_bonus )
```
[19.3268779]
[19.3268849]
```
static void stab_message(actor *defender, int stab_bonus)
```
Insertion in crawl-ref/source/externs.h at line 336 [19.3270163]
[114.3419]
[24.2903]
```
    virtual bool can_bleed() const = 0;
```
Insertion in crawl-ref/source/externs.h at line 1057 [19.3270163]
[114.3485]
[24.2935]
```
    bool can_bleed() const;
```
Insertion in crawl-ref/source/externs.h at line 1452 [19.3270163]
[114.3551]
[24.2955]
```
    bool can_bleed() const;
```

Replacement in crawl-ref/source/beam.cc at line 2257 [19.4128068]

B:BD[115.3093] → [115.3093:3157]

               && is_unchivalric_attack(&you, monster, monster)

[115.3093]

[115.3157]

               && is_unchivalric_attack(&you, monster)

Remove atk and def from melee_attack.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/religion.cc at line 3173 [19.804403]

Insertion in crawl-ref/source/player.cc at line 7144 [19.962854]

Replacement in crawl-ref/source/monstuff.cc at line 6266 [19.1396662]

Insertion in crawl-ref/source/mon-util.cc at line 7486 [19.1699344]

Deletion in crawl-ref/source/misc.h at line 46 [19.1928926]

Deletion in crawl-ref/source/misc.cc at line 1103 [19.1933596]

Replacement in crawl-ref/source/misc.cc at line 1175 [19.1933596]

Replacement in crawl-ref/source/misc.cc at line 1177 [19.1933596]

Replacement in crawl-ref/source/misc.cc at line 3091 [19.1933596]

Replacement in crawl-ref/source/fight.h at line 84 [19.3139131]

Deletion in crawl-ref/source/fight.h at line 89 [19.3139131]

Replacement in crawl-ref/source/fight.h at line 91 [19.3139131]

Replacement in crawl-ref/source/fight.h at line 184 [19.3139131]

Replacement in crawl-ref/source/fight.cc at line 68 [19.3140790]

Replacement in crawl-ref/source/fight.cc at line 260 [19.3140790]

Insertion in crawl-ref/source/fight.cc at line 262 [19.3140790]

Deletion in crawl-ref/source/fight.cc at line 315 [19.3140790]

Deletion in crawl-ref/source/fight.cc at line 348 [19.3140790]

Replacement in crawl-ref/source/fight.cc at line 483 [19.3140790]

Replacement in crawl-ref/source/fight.cc at line 523 [19.3140790]

Replacement in crawl-ref/source/fight.cc at line 525 [19.3140790]

Insertion in crawl-ref/source/fight.cc at line 530 [19.3140790]

Replacement in crawl-ref/source/fight.cc at line 538 [19.3140790]

Replacement in crawl-ref/source/fight.cc at line 543 [19.3140790]

Replacement in crawl-ref/source/fight.cc at line 545 [19.3140790]

Replacement in crawl-ref/source/fight.cc at line 597 [19.3140790]

Replacement in crawl-ref/source/fight.cc at line 600 [19.3140790]

Replacement in crawl-ref/source/fight.cc at line 606 [19.3140790]

Replacement in crawl-ref/source/fight.cc at line 610 [19.3140790]

Replacement in crawl-ref/source/fight.cc at line 618 [19.3140790]

Replacement in crawl-ref/source/fight.cc at line 624 [19.3140790]

Replacement in crawl-ref/source/fight.cc at line 631 [19.3140790]

Replacement in crawl-ref/source/fight.cc at line 637 [19.3140790]

Replacement in crawl-ref/source/fight.cc at line 654 [19.3140790]

Replacement in crawl-ref/source/fight.cc at line 667 [19.3140790]

Insertion in crawl-ref/source/fight.cc at line 671 [19.3140790]

Replacement in crawl-ref/source/fight.cc at line 728 [19.3140790]

Replacement in crawl-ref/source/fight.cc at line 744 [19.3140790]

Deletion in crawl-ref/source/fight.cc at line 748 [19.3140790]

Deletion in crawl-ref/source/fight.cc at line 749 [19.3140790]

Replacement in crawl-ref/source/fight.cc at line 752 [19.3140790]

Replacement in crawl-ref/source/fight.cc at line 838 [19.3140790]

Replacement in crawl-ref/source/fight.cc at line 847 [19.3140790]

Replacement in crawl-ref/source/fight.cc at line 849 [19.3140790]

Replacement in crawl-ref/source/fight.cc at line 884 [19.3140790]

Replacement in crawl-ref/source/fight.cc at line 896 [19.3140790]

Replacement in crawl-ref/source/fight.cc at line 910 [19.3140790]

Replacement in crawl-ref/source/fight.cc at line 913 [19.3140790]