fiddlerwoaroof/crawl - Change YBNZTFKEZDBA2BWBYEVU62CIVIVTA7LYIRJAOYKGQT7V64DAMZUQC

Merge mons_holiness() into monster::holiness(), and add an is_unholy()

convenience function.

Created by David Lawrence Ramsey on October 31, 2009

YBNZTFKEZDBA2BWBYEVU62CIVIVTA7LYIRJAOYKGQT7V64DAMZUQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/xom.cc at line 1415 [11.3]

∅:D[9.134] → [10.67:120]

B:BD[10.67] → [10.67:120]

                && mons_holiness(mon) == MH_NATURAL)

[9.134]

[12.1709]

                && mon->holiness() == MH_NATURAL)

Replacement in crawl-ref/source/view.cc at line 935 [14.16817]

B:BD[13.68] → [4.7:56]

    if (player_is_unholy() || crawl_state.arena)

[13.68]

[13.123]

    if (you.is_unholy() || crawl_state.arena)

Replacement in crawl-ref/source/view.cc at line 1520 [14.16817]
B:BD[14.48312] → [15.335:385]
```
        if (mons_holiness(monster) == MH_NATURAL)
```
[14.48312]
[14.48348]
```
        if (monster->holiness() == MH_NATURAL)
```

Replacement in crawl-ref/source/spl-cast.cc at line 1004 [14.293070]

B:BD[16.4694] → [17.297:363]

    if (player_is_unholy() && spell_typematch(spell, SPTYP_HOLY))

[16.4694]

[16.4757]

    if (you.is_unholy() && spell_typematch(spell, SPTYP_HOLY))

Replacement in crawl-ref/source/spells4.cc at line 396 [14.436250]
B:BD[14.459196] → [18.1302:1348]
```
    if (mons_holiness(monster) != MH_NATURAL)
```
[14.459196]
[18.1348]
```
    if (monster->holiness() != MH_NATURAL)
```
Replacement in crawl-ref/source/spells4.cc at line 1005 [14.436250]
B:BD[18.2770] → [18.2770:2818]
```
        || mons_holiness(monster) != MH_NATURAL
```
[18.2770]
[19.197]
```
        || monster->holiness() != MH_NATURAL
```
Replacement in crawl-ref/source/spells3.cc at line 2134 [14.531613]
B:BD[14.558284] → [20.620:665]
B:BD[20.665] → [21.151:207]
∅:D[21.207] → [14.558663:558677]
∅:D[20.772] → [14.558663:558677]
∅:D[22.148260] → [14.558663:558677]
B:BD[14.558663] → [14.558663:558677]
```
            if (monster->type != MONS_REAPER
                && mons_holiness(monster) != MH_UNDEAD)
            {
```
[14.558284]
[20.773]
```
            if (monster->holiness() != MH_UNDEAD)
```
Deletion in crawl-ref/source/spells3.cc at line 2136 [14.531613]
∅:D[20.799] → [14.558862:558876]
B:BD[14.558862] → [14.558862:558876]
```
            }
```

Replacement in crawl-ref/source/spells2.cc at line 683 [14.569242]

B:BD[23.307] → [23.307:359]

            || mons_holiness(monster) != MH_NATURAL

[23.307]

[19.240]

            || monster->holiness() != MH_NATURAL

Replacement in crawl-ref/source/spells2.cc at line 749 [14.569242]
B:BD[14.595281] → [23.738:775]
```
        if (mons_is_unholy(monster))
```
[14.595281]
[24.733]
```
        if (monster->is_unholy())
```
Replacement in crawl-ref/source/spells2.cc at line 756 [14.569242]
B:BD[14.595411] → [25.411:460]
```
        if (mons_holiness(monster) != MH_NATURAL
```
[14.595411]
[19.288]
```
        if (monster->holiness() != MH_NATURAL
```

Replacement in crawl-ref/source/spells1.cc at line 674 [14.616635]

B:BD[26.194] → [26.194:249]

    const mon_holy_type holiness = mons_holiness(mon);

[26.194]

[26.249]

    const mon_holy_type holiness = mon->holiness();

Replacement in crawl-ref/source/religion.cc at line 1434 [14.804403]

B:BD[27.2560] → [27.2560:2620]

    return (mon->alive() && mons_holiness(mon) == MH_UNDEAD

[27.2560]

[28.2518]

    return (mon->alive() && mon->holiness() == MH_UNDEAD

Replacement in crawl-ref/source/religion.cc at line 6814 [14.804403]
B:BD[29.4810] → [29.4810:4864]
```
    if (player_is_unholy() && is_good_god(which_god))
```
[29.4810]
[29.4864]
```
    if (you.is_unholy() && is_good_god(which_god))
```
Insertion in crawl-ref/source/player.h at line 411 [14.945993]
[30.15490]
[30.15490]
```
    bool is_unholy() const;
```
Deletion in crawl-ref/source/player.h at line 661 [14.945993]
B:BD[31.5807] → [17.2832:2857]
```
bool player_is_unholy();
```

Replacement in crawl-ref/source/player.cc at line 6326 [14.962854]

B:BD[32.9177] → [17.2859:2913]

        if (player_is_unholy() && is_holy_item(item))

[32.9177]

[32.9282]

        if (is_unholy() && is_holy_item(item))

Replacement in crawl-ref/source/player.cc at line 6735 [14.962854]
B:BD[17.2917] → [17.2917:2941]
```
bool player_is_unholy()
```
[17.2917]
[17.2941]
```
bool player::is_unholy() const
```
Replacement in crawl-ref/source/player.cc at line 6737 [14.962854]
B:BD[17.2943] → [17.2943:2994]
```
    const mon_holy_type holiness = you.holiness();
```
[17.2943]
[17.2994]
```
    const mon_holy_type holi = holiness();
```

Replacement in crawl-ref/source/player.cc at line 6739 [14.962854]

B:BD[17.2995] → [17.2995:3057]

    return (holiness == MH_UNDEAD || holiness == MH_DEMONIC);

[17.2995]

[31.11830]

    return (holi == MH_UNDEAD || holi == MH_DEMONIC);

Replacement in crawl-ref/source/player.cc at line 6813 [14.962854]
B:BD[33.2764] → [34.3768:3796]
```
    if (player_is_unholy())
```
[33.2764]
[34.3796]
```
    if (is_unholy())
```

Replacement in crawl-ref/source/mstuff2.cc at line 1225 [14.1340842]

B:BD[35.7056] → [35.7056:7107]

            if (mons_holiness(targ) == MH_DEMONIC)

[35.7056]

[35.7107]

            if (targ->holiness() == MH_DEMONIC)

Replacement in crawl-ref/source/mstuff2.cc at line 1227 [14.1340842]

B:BD[35.7149] → [35.7149:7205]

            else if (mons_holiness(targ) != MH_NATURAL)

[35.7149]

[35.7205]

            else if (targ->holiness() != MH_NATURAL)

Replacement in crawl-ref/source/monstuff.cc at line 69 [14.1396662]
B:BD[14.1397982] → [36.2631:2678]
```
static bool _wounded_damaged(int wound_class);
```
[14.1397982]
[37.2687]
```
static bool _wounded_damaged(monster_type mon_type);
```

Replacement in crawl-ref/source/monstuff.cc at line 609 [14.1396662]

∅:D[38.2546] → [39.3726:3771]

B:BD[39.3726] → [39.3726:3771]

B:BD[39.3771] → [40.3173:3222]

    if (mons_holiness(monster) != MH_NATURAL
            && mons_holiness(monster) != MH_HOLY

[38.2546]

[39.3771]

    if (monster->holiness() != MH_NATURAL
            && monster->holiness() != MH_HOLY

Replacement in crawl-ref/source/monstuff.cc at line 1449 [14.1396662]
∅:D[41.2709] → [42.3258:3318]
∅:D[43.2888] → [42.3258:3318]
B:BD[42.3258] → [42.3258:3318]
```
    const mon_holy_type targ_holy = mons_holiness(monster);
```
[43.2888]
[44.2757]
```
    const mon_holy_type targ_holy = monster->holiness();
```

Replacement in crawl-ref/source/monstuff.cc at line 1468 [14.1396662]

B:BD[45.3144] → [45.3144:3194]

                         "destroyed" : "killed");

[45.3144]

[45.3194]

                             "destroyed" : "killed");

Replacement in crawl-ref/source/monstuff.cc at line 1474 [14.1396662]

B:BD[45.3402] → [45.3402:3467]

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

[45.3402]

[45.3467]

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

Replacement in crawl-ref/source/monstuff.cc at line 1603 [14.1396662]
∅:D[46.3321] → [22.413697:413753]
B:BD[14.1412201] → [22.413697:413753]
```
                && mons_holiness(monster) == MH_NATURAL
```
[14.1412201]
[3.2469]
```
                && monster->holiness() == MH_NATURAL
```

Replacement in crawl-ref/source/monstuff.cc at line 1637 [14.1396662]

∅:D[36.2828] → [47.311:379]

B:BD[47.311] → [47.311:379]

                                       " is destroyed!" : " dies!",

[36.2828]

[47.379]

                                           " is destroyed!" : " dies!",

Replacement in crawl-ref/source/monstuff.cc at line 1680 [14.1396662]

B:BD[48.2824] → [48.2824:2891]

                    anon ? MH_NATURAL : mons_holiness(killer_mon);

[48.2824]

[14.1413592]

                    anon ? MH_NATURAL : killer_mon->holiness();

Replacement in crawl-ref/source/monstuff.cc at line 1836 [14.1396662]

∅:D[36.2902] → [47.635:703]

B:BD[47.635] → [47.635:703]

                                       " is destroyed!" : " dies!",

[36.2902]

[47.703]

                                           " is destroyed!" : " dies!",

Replacement in crawl-ref/source/monstuff.cc at line 2120 [14.1396662]

B:BD[49.4381] → [9.3146:3212]

    if (mons_class_holiness(new_mclass) != mons_holiness(monster)

[49.4381]

[9.3212]

    if (mons_class_holiness(new_mclass) != monster->holiness()

Replacement in crawl-ref/source/monstuff.cc at line 2548 [14.1396662]

B:BD[50.6350] → [50.6350:6450]

    return (mons_holiness(monster) == MH_UNDEAD
            || mons_holiness(monster) == MH_NATURAL

[50.6350]

[50.6450]

    const mon_holy_type holi = monster->holiness();
    return (holi == MH_UNDEAD
            || holi == MH_NATURAL

Replacement in crawl-ref/source/monstuff.cc at line 2557 [14.1396662]

B:BD[50.6549] → [50.6549:6647]

        if (mons_holiness(mon) == MH_UNDEAD)
            monster_polymorph(mon, MONS_DEATH_OOZE);

[50.6549]

[50.6647]

    if (mon->holiness() == MH_UNDEAD)
        monster_polymorph(mon, MONS_DEATH_OOZE);
    else
    {
        const int x = mon->hit_dice + (coinflip() ? 1 : -1) * random2(5);
        if (x < 3)
            monster_polymorph(mon, MONS_OOZE);
        else if (x >= 3 && x < 5)
            monster_polymorph(mon, MONS_JELLY);
        else if (x >= 5 && x < 7)
            monster_polymorph(mon, MONS_BROWN_OOZE);
        else if (x >= 7 && x <= 11)
        {
            if (coinflip())
                monster_polymorph(mon, MONS_SLIME_CREATURE);
            else
                monster_polymorph(mon, MONS_GIANT_AMOEBA);
        }

Replacement in crawl-ref/source/monstuff.cc at line 2578 [14.1396662]

B:BD[50.6670] → [50.6670:6748]

∅:D[50.6748] → [51.2637:2638]

B:BD[52.2825] → [51.2637:2638]

B:BD[51.2638] → [50.6749:7257]

            const int x = mon->hit_dice + (coinflip() ? 1 : -1) * random2(5);
            if (x < 3)
                monster_polymorph(mon, MONS_OOZE);
            else if (x >= 3 && x < 5)
                monster_polymorph(mon, MONS_JELLY);
            else if (x >= 5 && x < 7)
                monster_polymorph(mon, MONS_BROWN_OOZE);
            else if (x >= 7 && x <= 11)
            {
                if (coinflip())
                    monster_polymorph(mon, MONS_SLIME_CREATURE);
                else
                    monster_polymorph(mon, MONS_GIANT_AMOEBA);
            }

[50.6670]

[50.7257]

            if (coinflip())
                monster_polymorph(mon, MONS_ACID_BLOB);

Replacement in crawl-ref/source/monstuff.cc at line 2581 [14.1396662]

B:BD[50.7274] → [50.7274:7477]

            {
                if (coinflip())
                    monster_polymorph(mon, MONS_ACID_BLOB);
                else
                    monster_polymorph(mon, MONS_AZURE_JELLY);
            }

[50.7274]

[50.7477]

                monster_polymorph(mon, MONS_AZURE_JELLY);

Insertion in crawl-ref/source/monstuff.cc at line 2583 [14.1396662]
[50.7487]
[50.7487]
```
    }
```

Replacement in crawl-ref/source/monstuff.cc at line 2598 [14.1396662]

B:BD[51.2686] → [51.2686:2760]

    mon->target = random_in_bounds(); // If we don't find anything better

[51.2686]

[51.2760]

    mon->target = random_in_bounds(); // If we don't find anything better.

Replacement in crawl-ref/source/monstuff.cc at line 2601 [14.1396662]

B:BD[51.2812] → [51.2812:2892]

        coord_def delta = coord_def(random2(13), random2(13)) - coord_def(6,6);

[51.2812]

[51.2892]

        coord_def delta = coord_def(random2(13), random2(13)) - coord_def(6, 6);

Replacement in crawl-ref/source/monstuff.cc at line 2953 [14.1396662]
B:BD[14.1435762] → [36.4279:4326]
```
static bool _wounded_damaged(int monster_type)
```
[14.1435762]
[14.1435800]
```
static bool _wounded_damaged(monster_type mon_type)
```

Replacement in crawl-ref/source/monstuff.cc at line 2956 [14.1396662]

B:BD[14.1435872] → [36.4327:4393]

    const mon_holy_type holy = mons_class_holiness(monster_type);

[14.1435872]

[14.1435921]

    const mon_holy_type holy = mons_class_holiness(mon_type);

Replacement in crawl-ref/source/monstuff.cc at line 3130 [14.1396662]

∅:D[53.2928] → [54.5965:6020]

∅:D[55.5490] → [54.5965:6020]

B:BD[54.5965] → [54.5965:6020]

B:BD[54.6020] → [55.5491:5554]

        if (mons_class_holiness(mon->type) == MH_PLANT
            || mons_class_holiness(mon->type) == MH_NONLIVING)

[55.5490]

[54.6083]

        if (mon->holiness() == MH_PLANT
            || mon->holiness() == MH_NONLIVING)

Replacement in crawl-ref/source/monstuff.cc at line 4661 [14.1396662]

∅:D[56.3042] → [57.3682:3811]

B:BD[57.3682] → [57.3682:3811]

                && mons_class_holiness(mon->type) != MH_PLANT
                && mons_class_holiness(mon->type) != MH_NONLIVING)

[56.3042]

[57.3811]

                && mon->holiness() != MH_PLANT
                && mon->holiness() != MH_NONLIVING)

Replacement in crawl-ref/source/monstuff.cc at line 4776 [14.1396662]

∅:D[58.2886] → [57.3904:4030]

B:BD[57.3904] → [57.3904:4030]

            if (mons_class_holiness(mon->type) == MH_PLANT
                || mons_class_holiness(mon->type) == MH_NONLIVING)

[58.2886]

[57.4030]

            if (mon->holiness() == MH_PLANT
                || mon->holiness() == MH_NONLIVING)

Insertion in crawl-ref/source/monster.h at line 285 [30.17727]
[30.27654]
[30.27654]
```
    bool is_unholy() const;
```
Deletion in crawl-ref/source/mon-util.h at line 583 [14.1682293]
B:BD[59.2765] → [59.2765:2815]
```
mon_holy_type mons_holiness(const monsters *mon);
```
Deletion in crawl-ref/source/mon-util.h at line 789 [14.1682293]
B:BD[59.2896] → [59.2896:2938]
```
bool mons_is_unholy(const monsters *mon);
```
Replacement in crawl-ref/source/mon-util.cc at line 467 [14.1699344]
B:BD[60.9892] → [60.9892:9926]
```
    else if (mons_is_unholy(mon))
```
[60.9892]
[60.9926]
```
    else if (mon->is_unholy())
```

Replacement in crawl-ref/source/mon-util.cc at line 471 [14.1699344]

B:BD[60.9992] → [60.9992:10096]

        if (mons_holiness(mon) == MH_UNDEAD
            && _mons_has_undrinkable_potion(mon))
        {

[60.9992]

[60.10096]

        if (mon->holiness() == MH_UNDEAD && _mons_has_undrinkable_potion(mon))

Deletion in crawl-ref/source/mon-util.cc at line 473 [14.1699344]
B:BD[60.10115] → [60.10115:10125]
```
        }
```
Deletion in crawl-ref/source/mon-util.cc at line 484 [14.1699344]
B:BD[14.1703985] → [22.469648:469699]
B:BD[22.469699] → [61.2563:2613]
∅:D[61.2613] → [21.716:744]
∅:D[62.2807] → [21.716:744]
B:BD[21.716] → [21.716:744]
B:BD[21.744] → [63.3185:3186]
∅:D[21.753] → [22.469699:469744]
∅:D[63.3186] → [22.469699:469744]
B:BD[22.469699] → [22.469699:469744]
B:BD[14.1704042] → [64.2629:2631]
∅:D[64.2631] → [14.1704097:1704098]
B:BD[14.1704097] → [14.1704097:1704098]
```
mon_holy_type mons_holiness(const monsters *mon)
{
    if (testbits(mon->flags, MF_HONORARY_UNDEAD))
        return (MH_UNDEAD);
    return (mons_class_holiness(mon->type));
}
```

Replacement in crawl-ref/source/mon-util.cc at line 571 [14.1699344]

B:BD[65.3176] → [65.3176:3230]

        return (mons_holiness(monster) == MH_UNDEAD);

[65.3176]

[65.3230]

        return (monster->holiness() == MH_UNDEAD);

Replacement in crawl-ref/source/mon-util.cc at line 1241 [14.1699344]
B:BD[66.2936] → [59.3621:3665]
```
    return (mons_holiness(mon) == MH_HOLY);
```
[66.2936]
[66.2982]
```
    return (mon->holiness() == MH_HOLY);
```
Deletion in crawl-ref/source/mon-util.cc at line 1247 [14.1699344]
∅:D[59.3755] → [22.473150:473153]
B:BD[22.473150] → [22.473150:473153]
B:BD[22.473153] → [59.3756:3797]
∅:D[59.3797] → [22.473196:473198]
B:BD[22.473196] → [22.473196:473198]
B:BD[22.473198] → [59.3798:3853]
∅:D[59.3853] → [67.4589:4652]
B:BD[67.4589] → [67.4589:4652]
```
}
bool mons_is_unholy(const monsters *mon)
{
    const mon_holy_type holiness = mons_holiness(mon);
    return (holiness == MH_UNDEAD || holiness == MH_DEMONIC);
```
Replacement in crawl-ref/source/mon-util.cc at line 1251 [14.1699344]
B:BD[67.4709] → [66.3038:3093]
```
    return (mons_is_evil(mon) || mons_is_unholy(mon));
```
[67.4709]
[22.473306]
```
    return (mons_is_evil(mon) || mon->is_unholy());
```
Replacement in crawl-ref/source/mon-util.cc at line 1256 [14.1699344]
B:BD[22.473358] → [59.3950:4005]
```
    const mon_holy_type holiness = mons_holiness(mon);
```
[22.473358]
[22.473401]
```
    const mon_holy_type holiness = mon->holiness();
```

Replacement in crawl-ref/source/mon-util.cc at line 2532 [14.1699344]

B:BD[55.6400] → [5.2720:2793]

            && (mons_holiness(m) != MH_PLANT || mons_is_stationary(m)));

[55.6400]

[22.482486]

            && (m->holiness() != MH_PLANT || mons_is_stationary(m)));

Replacement in crawl-ref/source/mon-util.cc at line 3564 [14.1699344]
B:BD[68.2698] → [69.2838:2889]
```
            || mons_holiness(this) == MH_DEMONIC);
```
[68.2698]
[70.441]
```
            || holiness() == MH_DEMONIC);
```
Replacement in crawl-ref/source/mon-util.cc at line 3896 [14.1699344]
B:BD[32.15342] → [32.15342:15398]
```
        if (mons_is_unholy(this) && is_holy_item(item))
```
[32.15342]
[71.2537]
```
        if (is_unholy() && is_holy_item(item))
```

Replacement in crawl-ref/source/mon-util.cc at line 5821 [14.1699344]

B:BD[72.14217] → [72.14217:14251]

    return (mons_holiness(this));

[72.14217]

[72.14251]

    if (testbits(flags, MF_HONORARY_UNDEAD))
        return (MH_UNDEAD);
    return (mons_class_holiness(type));
}
bool monsters::is_unholy() const
{
    const mon_holy_type holi = holiness();
    return (holi == MH_UNDEAD || holi == MH_DEMONIC);

Replacement in crawl-ref/source/mon-util.cc at line 5963 [14.1699344]
B:BD[19.7575] → [8.3171:3223]
∅:D[8.3223] → [19.7631:7660]
B:BD[19.7631] → [19.7631:7660]
```
    const mon_holy_type holi = mons_holiness(this);
    if (mons_is_unholy(this)
```
[19.7575]
[8.3224]
```
    const mon_holy_type holi = holiness();
    if (is_unholy()
```
Replacement in crawl-ref/source/mon-util.cc at line 6023 [14.1699344]
B:BD[19.9094] → [19.9094:9137]
```
    if (mons_holiness(this) != MH_NATURAL)
```
[19.9094]
[19.9137]
```
    if (holiness() != MH_NATURAL)
```
Replacement in crawl-ref/source/mon-util.cc at line 6033 [14.1699344]
∅:D[34.4402] → [33.3108:3138]
B:BD[33.3108] → [33.3108:3138]
```
    if (mons_is_unholy(this))
```
[34.4402]
[33.3138]
```
    if (is_unholy())
```
Replacement in crawl-ref/source/mon-util.cc at line 6050 [14.1699344]
B:BD[72.14582] → [19.9174:9216]
```
    if (mons_holiness(this) != MH_NATURAL
```
[72.14582]
[19.9216]
```
    if (holiness() != MH_NATURAL
```
Replacement in crawl-ref/source/mon-util.cc at line 6088 [14.1699344]
B:BD[73.81980] → [69.2890:2942]
```
    const mon_holy_type holy = mons_holiness(this);
```
[73.81980]
[69.2942]
```
    const mon_holy_type holy = holiness();
```
Replacement in crawl-ref/source/mon-util.cc at line 7499 [14.1699344]
B:BD[74.20269] → [75.5054:5101]
```
        if (!mons_class_flag( type, M_INVIS ))
```
[74.20269]
[75.5101]
```
        if (!mons_class_flag(type, M_INVIS))
```

Replacement in crawl-ref/source/mon-util.cc at line 7509 [14.1699344]

B:BD[74.20637] → [74.20637:20748]

        // Air elementals are a special case, as their
        // submerging in air isn't up to choice. -- bwr

[74.20637]

[76.2668]

        // Air elementals are a special case, as their submerging in air
        // isn't up to choice. - bwr

Replacement in crawl-ref/source/mon-info.cc at line 157 [77.4325]
B:BD[77.8323] → [77.8323:8359]
```
            return(" (petrified)");
```
[77.8323]
[77.8359]
```
            return (" (petrified)");
```
Replacement in crawl-ref/source/mon-info.cc at line 159 [77.4325]
B:BD[77.8393] → [77.8393:8429]
```
            return(" (paralysed)");
```
[77.8393]
[77.8429]
```
            return (" (paralysed)");
```
Replacement in crawl-ref/source/mon-info.cc at line 161 [77.4325]
B:BD[77.8464] → [77.8464:8501]
```
            return(" (petrifying)");
```
[77.8464]
[77.8501]
```
            return (" (petrifying)");
```
Replacement in crawl-ref/source/mon-info.cc at line 163 [77.4325]
B:BD[77.8534] → [77.8534:8569]
```
            return(" (confused)");
```
[77.8534]
[77.8569]
```
            return (" (confused)");
```
Replacement in crawl-ref/source/mon-info.cc at line 165 [77.4325]
B:BD[77.8601] → [77.8601:8635]
```
            return(" (fleeing)");
```
[77.8601]
[7.4049]
```
            return (" (fleeing)");
```

Replacement in crawl-ref/source/mon-info.cc at line 168 [77.4325]

B:BD[77.8678] → [77.8678:8825]

            if (mons_holiness(m) == MH_UNDEAD
                || mons_holiness(m) == MH_NONLIVING
                || mons_holiness(m) == MH_PLANT)

[77.8678]

[77.8825]

            if (m->holiness() == MH_UNDEAD
                || m->holiness() == MH_NONLIVING
                || m->holiness() == MH_PLANT)

Replacement in crawl-ref/source/mon-info.cc at line 172 [77.4325]
B:BD[77.8839] → [77.8839:8877]
```
                return(" (dormant)");
```
[77.8839]
[77.8877]
```
                return (" (dormant)");
```
Replacement in crawl-ref/source/mon-info.cc at line 175 [77.4325]
B:BD[77.8908] → [77.8908:8947]
```
                return(" (sleeping)");
```
[77.8908]
[77.8947]
```
                return (" (sleeping)");
```
Replacement in crawl-ref/source/mon-info.cc at line 181 [77.4325]
B:BD[77.9160] → [77.9160:9196]
```
            return(" (wandering)");
```
[77.9160]
[77.9196]
```
            return (" (wandering)");
```
Replacement in crawl-ref/source/makeitem.cc at line 3069 [78.927]
B:BD[78.100114] → [79.2898:2926]
```
    if (mons_is_unholy(mon)
```
[78.100114]
[79.2926]
```
    if (mon->is_unholy()
```
Replacement in crawl-ref/source/itemprop.cc at line 2087 [22.646661]
B:BD[80.3305] → [17.3255:3286]
```
        && player_is_unholy())
```
[80.3305]
[22.695686]
```
        && you.is_unholy())
```
Replacement in crawl-ref/source/item_use.cc at line 147 [14.2781507]
B:BD[81.363824] → [17.3291:3344]
```
    if (player_is_unholy() && is_holy_item(*weapon))
```
[81.363824]
[22.731240]
```
    if (you.is_unholy() && is_holy_item(*weapon))
```
Deletion in crawl-ref/source/item_use.cc at line 1722 [14.2781507]
B:BD[82.8009] → [82.8009:8059]
```
    mon_holy_type holiness = victim->holiness();
```
Replacement in crawl-ref/source/item_use.cc at line 1723 [14.2781507]
B:BD[82.8060] → [82.8060:8128]
```
    if (shifter || holiness == MH_UNDEAD || holiness == MH_DEMONIC)
```
[82.8060]
[82.8128]
```
    if (shifter || victim->is_unholy())
```
Deletion in crawl-ref/source/fight.h at line 189 [14.3139131]
B:BD[72.54942] → [83.2972:3003]
```
    bool defender_is_unholy();
```

Deletion in crawl-ref/source/fight.cc at line 2150 [14.3140790]

B:BD[14.3170146] → [83.3005:3193]

bool melee_attack::defender_is_unholy()
{
    if (defender->atype() == ACT_PLAYER)
        return (player_is_unholy());
    else
        return (mons_is_unholy(defender_as_monster()));
}

Replacement in crawl-ref/source/fight.cc at line 2314 [14.3140790]

B:BD[84.9520] → [10.2894:3020]

    const bool is_natural = mon && mons_holiness(defender_as_monster())
                                       == MH_NATURAL;

[84.9520]

    const bool is_natural = mon && defender->holiness() == MH_NATURAL;

Replacement in crawl-ref/source/fight.cc at line 3068 [14.3140790]
B:BD[85.57517] → [83.3194:3228]
```
        if (defender_is_unholy())
```
[85.57517]
[85.57690]
```
        if (defender->is_unholy())
```
Replacement in crawl-ref/source/effects.cc at line 67 [14.3382105]
B:BD[86.6029] → [17.3369:3398]
```
    if (!player_is_unholy())
```
[86.6029]
[87.3022]
```
    if (!you.is_unholy())
```
Replacement in crawl-ref/source/effects.cc at line 129 [14.3382105]
B:BD[88.4163] → [89.9248:9303]
```
    if (!monster->alive() || !mons_is_unholy(monster))
```
[88.4163]
[87.3107]
```
    if (!monster->alive() || !monster->is_unholy())
```

Replacement in crawl-ref/source/effects.cc at line 299 [14.3382105]

B:BD[14.3383672] → [19.10359:10425]

    if (!monster->alive() || monster->res_negative_energy() == 3)

[14.3383672]

[87.3349]

    if (!monster->alive() || monster->res_torment())

Replacement in crawl-ref/source/delay.cc at line 67 [14.3963459]

B:BD[90.3181] → [26.2899:2954]

    const mon_holy_type holiness = mons_holiness(mon);

[90.3181]

[26.2954]

    const mon_holy_type holiness = mon->holiness();

Replacement in crawl-ref/source/delay.cc at line 88 [14.3963459]
B:BD[90.3512] → [18.14099:14139]
```
    monsters *mons = monster_at(where);
```
[90.3431]
[90.3545]
```
    monsters *mon = monster_at(where);
```
Replacement in crawl-ref/source/delay.cc at line 90 [14.3963459]
B:BD[90.3546] → [18.14140:14162]
```
    if (mons == NULL)
```
[90.3546]
[18.14162]
```
    if (mon == NULL)
```
Replacement in crawl-ref/source/delay.cc at line 93 [14.3963459]
∅:D[18.14183] → [91.23317:23353]
B:BD[90.3546] → [91.23317:23353]
```
    if (_recite_mons_useless(mons))
```
[18.14183]
[90.3680]
```
    if (_recite_mons_useless(mon))
```

Replacement in crawl-ref/source/delay.cc at line 100 [14.3963459]

B:BD[92.3322] → [66.3211:3267]

    const mon_holy_type holiness = mons_holiness(mons);

[92.3322]

[59.4214]

    const mon_holy_type holiness = mon->holiness();

Replacement in crawl-ref/source/delay.cc at line 106 [14.3963459]
B:BD[92.3530] → [92.3530:3572]
```
        resist = mons_resist_magic(mons);
```
[92.3530]
[66.3268]
```
        resist = mons_resist_magic(mon);
```

Replacement in crawl-ref/source/delay.cc at line 125 [14.3963459]

B:BD[93.3217] → [93.3217:3341]

             mons->add_ench(mon_enchant(ENCH_HASTE, 0, KC_YOU,
                            (16 + random2avg(13, 2)) * 10)))

[93.3217]

[94.3602]

             mon->add_ench(mon_enchant(ENCH_HASTE, 0, KC_YOU,
                                       (16 + random2avg(13, 2)) * 10)))

Replacement in crawl-ref/source/delay.cc at line 128 [14.3963459]

B:BD[94.3612] → [94.3612:3682]

            simple_monster_message(mons, " speeds up in annoyance!");

[94.3612]

[90.5181]


            simple_monster_message(mon, " speeds up in annoyance!");

Replacement in crawl-ref/source/delay.cc at line 132 [14.3963459]

B:BD[95.5336] → [95.5336:5414]

                 && mons->add_ench(mon_enchant(ENCH_BATTLE_FRENZY, 1, KC_YOU,

[95.5336]

[95.5414]

                 && mon->add_ench(mon_enchant(ENCH_BATTLE_FRENZY, 1, KC_YOU,

Replacement in crawl-ref/source/delay.cc at line 135 [14.3963459]

B:BD[93.3542] → [93.3542:3615]

            simple_monster_message(mons, " goes into a battle-frenzy!");

[93.3542]

[93.3615]

            simple_monster_message(mon, " goes into a battle-frenzy!");

Replacement in crawl-ref/source/delay.cc at line 153 [14.3963459]

B:BD[96.2806] → [96.2806:3014]

            if (!mons_class_is_confusable(mons->type)
                || !mons->add_ench(mon_enchant(ENCH_CONFUSION, 0, KC_YOU,
                                               (16 + random2avg(13, 2)) * 10)))

[96.2806]

[96.3014]

            if (!mons_class_is_confusable(mon->type)
                || !mon->add_ench(mon_enchant(ENCH_CONFUSION, 0, KC_YOU,
                                              (16 + random2avg(13, 2)) * 10)))

Replacement in crawl-ref/source/delay.cc at line 159 [14.3963459]

B:BD[96.3043] → [96.3043:3105]

            simple_monster_message(mons, " looks confused.");

[96.3043]

[96.3105]

            simple_monster_message(mon, " looks confused.");

Replacement in crawl-ref/source/delay.cc at line 165 [14.3963459]

B:BD[96.3188] → [96.3188:3282]

            mons->put_to_sleep();
            simple_monster_message(mons, " falls asleep!");

[96.3188]

[96.3282]

            mon->put_to_sleep();
            simple_monster_message(mon, " falls asleep!");

Replacement in crawl-ref/source/delay.cc at line 172 [14.3963459]

B:BD[96.3368] → [2.2905:3039]

            if (!mons->add_ench(mon_enchant(ENCH_NEUTRAL, 0, KC_YOU,
                                (16 + random2avg(13, 2)) * 10)))

[96.3368]

[2.3039]

            if (!mon->add_ench(mon_enchant(ENCH_NEUTRAL, 0, KC_YOU,
                               (16 + random2avg(13, 2)) * 10)))

Replacement in crawl-ref/source/delay.cc at line 177 [14.3963459]

∅:D[2.3068] → [96.3443:3506]

B:BD[96.3443] → [96.3443:3506]

            simple_monster_message(mons, " seems impressed!");

[2.3068]

[96.3506]

            simple_monster_message(mon, " seems impressed!");

Replacement in crawl-ref/source/delay.cc at line 182 [14.3963459]
B:BD[96.3576] → [96.3576:3620]
```
            if (!mons->add_ench(ENCH_FEAR))
```
[96.3576]
[96.3620]
```
            if (!mon->add_ench(ENCH_FEAR))
```

Replacement in crawl-ref/source/delay.cc at line 184 [14.3963459]

B:BD[96.3648] → [96.3648:3709]

            simple_monster_message(mons, " turns to flee.");

[96.3648]

[96.3709]

            simple_monster_message(mon, " turns to flee.");

Replacement in crawl-ref/source/delay.cc at line 188 [14.3963459]

B:BD[96.3762] → [96.3762:3898]

            if (!mons->add_ench(mon_enchant(ENCH_PARALYSIS, 0, KC_YOU,
                                (16 + random2avg(13, 2)) * 10)))

[96.3762]

[2.3069]

            if (!mon->add_ench(mon_enchant(ENCH_PARALYSIS, 0, KC_YOU,
                               (16 + random2avg(13, 2)) * 10)))

Replacement in crawl-ref/source/delay.cc at line 193 [14.3963459]

∅:D[2.3098] → [96.3926:3991]

B:BD[96.3926] → [96.3926:3991]

            simple_monster_message(mons, " freezes in fright!");

[2.3098]

[96.3991]

            simple_monster_message(mon, " freezes in fright!");

Replacement in crawl-ref/source/delay.cc at line 197 [14.3963459]

B:BD[96.4064] → [96.4064:4117]

                good_god_holy_attitude_change(mons);

[96.4064]

[96.4117]

                good_god_holy_attitude_change(mon);

Replacement in crawl-ref/source/delay.cc at line 202 [14.3963459]

B:BD[96.4235] → [2.3099:3249]

                    if (!mons->add_ench(mon_enchant(ENCH_NEUTRAL, 0, KC_YOU,
                                        (16 + random2avg(13, 2)) * 10)))

[96.4235]

[2.3249]

                    if (!mon->add_ench(mon_enchant(ENCH_NEUTRAL, 0, KC_YOU,
                                       (16 + random2avg(13, 2)) * 10)))

Replacement in crawl-ref/source/delay.cc at line 207 [14.3963459]

∅:D[2.3294] → [97.2675:2746]

B:BD[96.4326] → [97.2675:2746]

                    simple_monster_message(mons, " seems impressed!");

[2.3294]

[96.4326]

                    simple_monster_message(mon, " seems impressed!");

Replacement in crawl-ref/source/delay.cc at line 211 [14.3963459]

B:BD[97.2792] → [97.2792:2869]

B:BD[97.2869] → [98.3626:3665]

                    simple_monster_message(mons, " seems fully impressed!");
                    mons_pacify(mons);

[96.4383]

[96.4811]

                    simple_monster_message(mon, " seems fully impressed!");
                    mons_pacify(mon);

Replacement in crawl-ref/source/decks.cc at line 2519 [14.3987460]

B:BD[99.61422] → [99.61422:61478]

                || mons_holiness(monster) != MH_NATURAL

[99.61422]

[99.61478]

                || monster->holiness() != MH_NATURAL

Replacement in crawl-ref/source/beam.cc at line 2482 [14.4128068]
B:BD[100.743] → [101.4324:4373]
```
        if (mons_holiness(monster) != MH_UNDEAD)
```
[100.743]
[100.804]
```
        if (monster->holiness() != MH_UNDEAD)
```

Replacement in crawl-ref/source/beam.cc at line 2494 [14.4128068]

B:BD[100.1122] → [100.1122:1176]

             || mons_holiness(monster) == MH_NATURAL)

[100.1122]

[100.1176]

             || monster->holiness() == MH_NATURAL)

Replacement in crawl-ref/source/beam.cc at line 4839 [14.4128068]
B:BD[102.10523] → [102.10523:10570]
```
        rc = (mons_holiness(mon) == MH_NATURAL
```
[102.10523]
[102.10570]
```
        rc = (mon->holiness() == MH_NATURAL
```

Replacement in crawl-ref/source/beam.cc at line 4844 [14.4128068]

B:BD[102.10668] → [102.10668:10749]

        rc = (mons_holiness(mon) == MH_UNDEAD && mon->attitude != ATT_FRIENDLY);

[102.10668]

[60.14806]

        rc = (mon->holiness() == MH_UNDEAD && mon->attitude != ATT_FRIENDLY);

Replacement in crawl-ref/source/beam.cc at line 4848 [14.4128068]

B:BD[60.14850] → [60.14850:14897]

B:BD[60.14897] → [103.59063:59112]

        rc = (mons_holiness(mon) == MH_NATURAL
              && mon->attitude != ATT_FRIENDLY);

[60.14850]

[102.10749]

        rc = (mon->holiness() == MH_NATURAL && mon->attitude != ATT_FRIENDLY);

Replacement in crawl-ref/source/beam.cc at line 4852 [14.4128068]
B:BD[102.10794] → [102.10794:10842]
```
        rc = (mons_holiness(mon) == MH_UNDEAD);
```
[102.10794]
[102.10842]
```
        rc = (mon->holiness() == MH_UNDEAD);
```

Replacement in crawl-ref/source/beam.cc at line 4856 [14.4128068]

B:BD[102.10887] → [102.10887:10959]

        rc = (mons_holiness(mon) == MH_DEMONIC && !mons_friendly(mon));

[102.10887]

[102.10959]

        rc = (mon->holiness() == MH_DEMONIC && !mons_friendly(mon));

Replacement in crawl-ref/source/beam.cc at line 4864 [14.4128068]

B:BD[102.11077] → [104.6715:6849]

        rc = !mon->has_ench(ENCH_SLEEP_WARY)      // slept recently
             && mons_holiness(mon) == MH_NATURAL  // no unnatural

[102.11077]

[19.11742]

        rc = !mon->has_ench(ENCH_SLEEP_WARY)   // slept recently
             && mon->holiness() == MH_NATURAL  // no unnatural

Replacement in crawl-ref/source/beam.cc at line 4870 [14.4128068]

B:BD[105.9209] → [35.8418:8574]

        rc = (mons_holiness(mon) == MH_DEMONIC && mon->type != MONS_HELL_HOG)
              || (mons_holiness(mon) == MH_NATURAL && mon->type != MONS_HOG);

[105.9209]

[106.30829]

        rc = (mon->holiness() == MH_DEMONIC && mon->type != MONS_HELL_HOG)
              || (mon->holiness() == MH_NATURAL && mon->type != MONS_HOG);

Replacement in crawl-ref/source/beam.cc at line 5216 [14.4128068]

B:BD[105.9467] → [6.3195:3266]

        if (monster_polymorph(mon, (mons_holiness(mon) == MH_DEMONIC ?

[105.9467]

[35.8645]

        if (monster_polymorph(mon, (mon->holiness() == MH_DEMONIC ?

Replacement in crawl-ref/source/beam.cc at line 5716 [14.4128068]
∅:D[60.15727] → [22.1253559:1253610]
B:BD[14.4259653] → [22.1253559:1253610]
```
        return (mons_holiness(mon) == MH_NATURAL);
```
[60.15727]
[60.15728]
```
        return (mon->holiness() == MH_NATURAL);
```
Replacement in crawl-ref/source/beam.cc at line 5721 [14.4128068]
∅:D[107.3095] → [22.1253611:1253661]
∅:D[103.72708] → [22.1253611:1253661]
B:BD[14.4259832] → [22.1253611:1253661]
```
        return (mons_holiness(mon) == MH_UNDEAD);
```
[103.72708]
[14.4259888]
```
        return (mon->holiness() == MH_UNDEAD);
```
Replacement in crawl-ref/source/beam.cc at line 5729 [14.4128068]
∅:D[103.72779] → [22.1253662:1253713]
B:BD[14.4260059] → [22.1253662:1253713]
```
        return (mons_holiness(mon) == MH_DEMONIC);
```
[103.72779]
[14.4260190]
```
        return (mon->holiness() == MH_DEMONIC);
```
Insertion in crawl-ref/source/actor.h at line 170 [30.35200]
[30.41716]
[30.41716]
```
    virtual bool is_unholy() const = 0;
```

Merge mons_holiness() into monster::holiness(), and add an is_unholy()

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/xom.cc at line 1415 [11.3]

Replacement in crawl-ref/source/view.cc at line 935 [14.16817]

Replacement in crawl-ref/source/view.cc at line 1520 [14.16817]

Replacement in crawl-ref/source/spl-cast.cc at line 1004 [14.293070]

Replacement in crawl-ref/source/spells4.cc at line 396 [14.436250]

Replacement in crawl-ref/source/spells4.cc at line 1005 [14.436250]

Replacement in crawl-ref/source/spells3.cc at line 2134 [14.531613]

Deletion in crawl-ref/source/spells3.cc at line 2136 [14.531613]

Replacement in crawl-ref/source/spells2.cc at line 683 [14.569242]

Replacement in crawl-ref/source/spells2.cc at line 749 [14.569242]

Replacement in crawl-ref/source/spells2.cc at line 756 [14.569242]

Replacement in crawl-ref/source/spells1.cc at line 674 [14.616635]

Replacement in crawl-ref/source/religion.cc at line 1434 [14.804403]

Replacement in crawl-ref/source/religion.cc at line 6814 [14.804403]

Insertion in crawl-ref/source/player.h at line 411 [14.945993]

Deletion in crawl-ref/source/player.h at line 661 [14.945993]

Replacement in crawl-ref/source/player.cc at line 6326 [14.962854]

Replacement in crawl-ref/source/player.cc at line 6735 [14.962854]

Replacement in crawl-ref/source/player.cc at line 6737 [14.962854]

Replacement in crawl-ref/source/player.cc at line 6739 [14.962854]

Replacement in crawl-ref/source/player.cc at line 6813 [14.962854]

Replacement in crawl-ref/source/mstuff2.cc at line 1225 [14.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 1227 [14.1340842]

Replacement in crawl-ref/source/monstuff.cc at line 69 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 609 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 1449 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 1468 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 1474 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 1603 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 1637 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 1680 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 1836 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2120 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2548 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2557 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2578 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2581 [14.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 2583 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2598 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2601 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2953 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2956 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 3130 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 4661 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 4776 [14.1396662]

Insertion in crawl-ref/source/monster.h at line 285 [30.17727]

Deletion in crawl-ref/source/mon-util.h at line 583 [14.1682293]

Deletion in crawl-ref/source/mon-util.h at line 789 [14.1682293]

Replacement in crawl-ref/source/mon-util.cc at line 467 [14.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 471 [14.1699344]

Deletion in crawl-ref/source/mon-util.cc at line 473 [14.1699344]

Deletion in crawl-ref/source/mon-util.cc at line 484 [14.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 571 [14.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1241 [14.1699344]

Deletion in crawl-ref/source/mon-util.cc at line 1247 [14.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1251 [14.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1256 [14.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2532 [14.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3564 [14.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3896 [14.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 5821 [14.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 5963 [14.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 6023 [14.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 6033 [14.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 6050 [14.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 6088 [14.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 7499 [14.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 7509 [14.1699344]

Replacement in crawl-ref/source/mon-info.cc at line 157 [77.4325]

Replacement in crawl-ref/source/mon-info.cc at line 159 [77.4325]

Replacement in crawl-ref/source/mon-info.cc at line 161 [77.4325]

Replacement in crawl-ref/source/mon-info.cc at line 163 [77.4325]

Replacement in crawl-ref/source/mon-info.cc at line 165 [77.4325]

Replacement in crawl-ref/source/mon-info.cc at line 168 [77.4325]

Replacement in crawl-ref/source/mon-info.cc at line 172 [77.4325]

Replacement in crawl-ref/source/mon-info.cc at line 175 [77.4325]