fiddlerwoaroof/crawl - Change OWERGKLVPNPGIIS23FZ7ZDOBWUIXCKYAFG3URXU75JAUDX3N5ENAC

Clean up holiness handling, as well as a few other miscellaneous things.

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

Created by dolorous on March 13, 2008

OWERGKLVPNPGIIS23FZ7ZDOBWUIXCKYAFG3URXU75JAUDX3N5ENAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 1218 [7.16817]

B:BD[7.47313] → [7.47313:47613]

    // Repel undead is a holy aura, to which evil creatures are sensitive.
    // Note that even though demons aren't affected by repel undead, they
    // do sense this type of divine aura. -- bwr
    if (you.duration[DUR_REPEL_UNDEAD] 
        && (mon_holy == MH_UNDEAD || mon_holy == MH_DEMONIC))

[7.47313]

[7.47613]

    // Repel undead is a holy aura, to which undead and demonic
    // creatures are sensitive.  Note that even though demons aren't
    // affected by repel undead, they do sense this type of divine aura.
    // -- bwr
    if (you.duration[DUR_REPEL_UNDEAD] && mons_is_unholy(monster))

Deletion in crawl-ref/source/spells2.cc at line 1072 [7.569242]
B:BD[7.594951] → [7.594951:594952]
B:BD[7.594952] → [8.151978:152023]
```
    const int holy = mons_holiness(monster);
```
Replacement in crawl-ref/source/spells2.cc at line 1073 [7.569242]
B:BD[7.595004] → [7.595004:595053]
```
    if (holy == MH_UNDEAD || holy == MH_DEMONIC)
```
[7.595004]
[7.595053]
```
    if (mons_is_unholy(monster))
```
Replacement in crawl-ref/source/religion.cc at line 1670 [7.804403]
B:BD[8.189663] → [8.189663:189704]
```
        static const char *conducts[] = 
```
[8.189663]
[8.189704]
```
        static const char *conducts[] =
```
Replacement in crawl-ref/source/religion.cc at line 3535 [7.804403]
B:BD[9.3595] → [9.3595:3604]
```
        
```
[9.3595]
[9.3604]
Replacement in crawl-ref/source/religion.cc at line 3547 [7.804403]
B:BD[10.2779] → [10.2779:2784]
```
    
```
[10.2779]
[10.2784]

Replacement in crawl-ref/source/religion.cc at line 3550 [7.804403]

B:BD[10.2807] → [10.2807:3051]

    case GOD_ZIN:
    case GOD_SHINING_ONE:
    case GOD_ELYVILON:
    case GOD_OKAWARU:
        return (true);
        
    case GOD_BEOGH: // added penance to avoid killings for loot
        return (fr && mons_species(fr->id()) == MONS_ORC);

[10.2807]

[10.3051]

        case GOD_ZIN:
        case GOD_SHINING_ONE:
        case GOD_ELYVILON:
        case GOD_OKAWARU:
            return (true);
        case GOD_BEOGH: // added penance to avoid killings for loot
            return (mons_species(fr->id()) == MONS_ORC);

Replacement in crawl-ref/source/religion.cc at line 3558 [7.804403]
B:BD[10.3052] → [10.3052:3089]
```
    default:
        return (false);
```
[10.3052]
[10.3089]
```
        default:
            return (false);
```
Replacement in crawl-ref/source/monstuff.cc at line 473 [7.1396662]
B:BD[11.4356] → [11.4356:4392]
```
        if (random2(you.piety) > 30
```
[11.4356]
[11.4392]
```
        if (random2(you.piety) > piety_breakpoint(0)
```

Deletion in crawl-ref/source/monstuff.cc at line 483 [7.1396662]

B:BD[11.4695] → [12.3659:3846]

}
bool is_mons_evil_demonic_or_undead(monsters *mons)
{
    return (mons_holiness(mons) == MH_UNDEAD
            || mons_holiness(mons) == MH_DEMONIC
            || mons_is_evil(mons));

Replacement in crawl-ref/source/monstuff.cc at line 706 [7.1396662]

B:BD[12.4598] → [12.4598:4669]

                           && is_mons_evil_demonic_or_undead(monster))

[12.4598]

[6.2842]

                           && mons_is_evil_or_unholy(monster))

Replacement in crawl-ref/source/monstuff.cc at line 721 [7.1396662]

B:BD[12.4804] → [12.4804:4871]

                       && is_mons_evil_demonic_or_undead(monster))

[12.4804]

[6.2963]

                       && mons_is_evil_or_unholy(monster))

Replacement in crawl-ref/source/monstuff.cc at line 803 [7.1396662]

B:BD[7.1414521] → [8.415378:415467]

                            notice |= 
                                did_god_conduct(

[7.1414521]

[8.415467]

                            notice |=
                                did_god_conduct(

Replacement in crawl-ref/source/monstuff.cc at line 811 [7.1396662]

B:BD[8.415681] → [8.415681:415762]

                        notice |= did_god_conduct( DID_DEMON_KILLED_BY_SERVANT,

[8.415681]

[8.415762]

                        notice |= did_god_conduct( DID_DEMON_KILLED_BY_SERVANT,

Replacement in crawl-ref/source/monstuff.cc at line 824 [7.1396662]

B:BD[8.416236] → [8.416236:416313]

                    notice |= did_god_conduct( DID_ANGEL_KILLED_BY_SERVANT,

[8.416236]

[8.416313]

                    notice |= did_god_conduct( DID_ANGEL_KILLED_BY_SERVANT,

Replacement in crawl-ref/source/monstuff.cc at line 828 [7.1396662]

B:BD[8.416400] → [8.416400:416449]

                if (you.religion == GOD_VEHUMET

[8.416400]

[8.416449]

                if (you.religion == GOD_VEHUMET

Replacement in crawl-ref/source/monstuff.cc at line 830 [7.1396662]

B:BD[8.416479] → [8.416479:416557]

                    && (!player_under_penance() && random2(you.piety) >= 30))

[8.416479]

[8.416557]

                    && (!player_under_penance()
                        && random2(you.piety) >= piety_breakpoint(0)))

Replacement in crawl-ref/source/monstuff.cc at line 833 [7.1396662]

B:BD[8.416575] → [8.416575:416758]

                    /* Vehumet - only for non-undead servants (coding
                       convenience, no real reason except that Vehumet
                       prefers demons) */

[8.416575]

[8.416758]

                    // Vehumet - only for non-undead servants (coding
                    // convenience, no real reason except that Vehumet
                    // prefers demons)

Replacement in crawl-ref/source/monstuff.cc at line 844 [7.1396662]

B:BD[12.4925] → [12.4925:4988]

B:BD[12.4988] → [13.3427:3504]

                    && is_mons_evil_demonic_or_undead(monster)
                    && (!player_under_penance() && random2(you.piety) >= 30)

[12.4925]

[13.3504]

                    && mons_is_evil_or_unholy(monster)
                    && (!player_under_penance()
                        && random2(you.piety) >= piety_breakpoint(0))

Replacement in crawl-ref/source/monstuff.cc at line 5148 [7.1396662]
B:BD[14.1939] → [14.1939:1958]
```
    switch (trap) 
```
[14.1939]
[14.1958]
```
    switch (trap)
```
Insertion in crawl-ref/source/mon-util.h at line 636 [7.1682293]
[8.464645]
[15.264]
```
bool mons_is_evil_or_unholy( const monsters *mons );
```

Replacement in crawl-ref/source/mon-util.cc at line 882 [7.1699344]

B:BD[8.472017] → [8.472017:472141]

    const int holiness = mons_holiness( mon );
    return (holiness == MH_UNDEAD 
                || holiness == MH_DEMONIC

[8.472017]

[8.472141]

    const mon_holy_type holiness = mons_holiness( mon );
    return (mons_is_unholy(mon)

Replacement in crawl-ref/source/mon-util.cc at line 1008 [7.1699344]
B:BD[16.1802] → [16.1802:1848]
```
    return (mons_holiness(mon) != MH_NATURAL 
```
[16.1802]
[16.1848]
```
    return (mons_holiness(mon) != MH_NATURAL
```
Insertion in crawl-ref/source/mon-util.cc at line 1015 [7.1699344]
[7.1715098]
[7.1715098]
```
    const mon_holy_type holiness = mons_holiness( mon );
```

Replacement in crawl-ref/source/mon-util.cc at line 1017 [7.1699344]

B:BD[7.1715099] → [8.472796:472969]

    if (mons_holiness(mon) == MH_UNDEAD 
        || mons_holiness(mon) == MH_DEMONIC
        || mons_holiness(mon) == MH_NONLIVING
        || mons_holiness(mon) == MH_PLANT

[7.1715099]

[8.472969]

    if (mons_is_unholy(mon)
        || holiness == MH_NONLIVING
        || holiness == MH_PLANT

Replacement in crawl-ref/source/mon-util.cc at line 1054 [7.1699344]

B:BD[8.473198] → [8.473198:473251]

    const mon_holy_type holy = mons_holiness( mon );

[8.473198]

[8.473251]

    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 1059 [7.1699344]

B:BD[8.473252] → [8.473252:473306]

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

[8.473252]

[8.473306]

bool mons_is_evil_or_unholy( const monsters *mons )
{
    return (mons_is_evil(mons) || mons_is_unholy(mons));

Replacement in crawl-ref/source/mon-util.cc at line 1066 [7.1699344]
B:BD[8.473358] → [8.473358:473401]
```
    const int holy = mons_holiness( mon );
```
[8.473358]
[8.473401]
```
    const mon_holy_type holiness = mons_holiness( mon );
```
Replacement in crawl-ref/source/mon-util.cc at line 1068 [7.1699344]
B:BD[8.473402] → [8.473402:473455]
```
    return (holy == MH_NATURAL || holy == MH_PLANT);
```
[8.473402]
[17.11736]
```
    return (holiness == MH_NATURAL || holiness == MH_PLANT);
```

Replacement in crawl-ref/source/mon-util.cc at line 2024 [7.1699344]

B:BD[18.13516] → [18.13516:13521]

∅:D[19.1738] → [7.1744714:1744856]

∅:D[18.13521] → [7.1744714:1744856]

B:BD[7.1744714] → [7.1744714:1744856]

    
    // Eventually, we'll probably want to be able to have monsters 
    // learn which of their elemental bolts were resisted and have those

[18.13516]

[7.1744856]


    // Eventually, we'll probably want to be able to have monsters
    // learn which of their elemental bolts were resisted and have those

Replacement in crawl-ref/source/mon-util.cc at line 2041 [7.1699344]

B:BD[3.3362] → [3.3362:3532]

        const mon_holy_type holy = foe->holiness();
        return (holy == MH_UNDEAD || holy == MH_DEMONIC
                || holy == MH_NONLIVING || holy == MH_PLANT);

[3.3362]

[3.3532]

        const mon_holy_type holiness = foe->holiness();
        return (holiness == MH_UNDEAD || holiness == MH_DEMONIC
            || holiness == MH_NONLIVING || holiness == MH_PLANT);

Replacement in crawl-ref/source/mon-util.cc at line 3151 [7.1699344]
B:BD[2.444] → [2.444:449]
```
    
```
[2.444]
[20.276]

Replacement in crawl-ref/source/mon-util.cc at line 3169 [7.1699344]

B:BD[21.13004] → [21.13004:13083]

B:BD[21.13163] → [21.13163:13258]

    const int brand = get_weapon_brand(weap);
    const int holy = holiness();
    if (brand == SPWPN_HOLY_WRATH
        && (holy == MH_DEMONIC || holy == MH_UNDEAD))
    {

[21.13004]

[21.13258]

    if (get_weapon_brand(weap) == SPWPN_HOLY_WRATH && mons_is_unholy(this))

Deletion in crawl-ref/source/mon-util.cc at line 3171 [7.1699344]
B:BD[21.13282] → [21.13282:13288]
```
    }
```
Replacement in crawl-ref/source/mon-util.cc at line 3172 [7.1699344]
B:BD[21.13289] → [21.13289:13312]
```
    return (true);    
```
[21.13289]
[21.13312]
```
    return (true);
```
Replacement in crawl-ref/source/mon-data.h at line 46 [7.1826214]
B:BD[22.781] → [22.781:798]
```
    - holiness: 
```
[22.781]
[22.798]
```
    - holiness:
```

Replacement in crawl-ref/source/mon-data.h at line 53 [7.1826214]

B:BD[22.1146] → [22.1146:1218]

B:BD[22.1218] → [4.2558:2688]

       MH_DEMONIC    - similar to undead, but holy wrath does even more
                        damage and repel undead effects are ignored -- *no*
                        automatic hellfire resistance

[22.1146]

[22.1363]

       MH_DEMONIC    - similar to undead, but repel undead effects are
                        ignored -- *no* automatic hellfire resistance

Replacement in crawl-ref/source/mon-data.h at line 84 [7.1826214]
B:BD[22.2046] → [22.2046:2086]
```
     CE_HCL,             causes rotting
```
[22.2046]
[22.2086]
```
     CE_HCL,             causes rotting in non-Ghoul characters
```
Deletion in crawl-ref/source/makeitem.cc at line 2856 [23.927]
B:BD[23.101280] → [23.101280:101337]
```
    const mon_holy_type mholy = mons_holiness(mon);
    
```
Replacement in crawl-ref/source/makeitem.cc at line 2857 [23.927]
B:BD[24.3072] → [24.3072:3128]
```
        && (mholy == MH_UNDEAD || mholy == MH_DEMONIC))
```
[24.3072]
[23.101510]
```
        && mons_is_unholy(mon))
```

Replacement in crawl-ref/source/fight.cc at line 1921 [7.3140790]

B:BD[25.57517] → [26.60006:60044]

        switch (defender->holiness())

[25.57517]

[7.3171077]

        if (defender->holiness() == MH_UNDEAD ||
            defender->holiness() == MH_DEMONIC)

Deletion in crawl-ref/source/fight.cc at line 1924 [7.3140790]
B:BD[7.3171087] → [25.57554:57578]
B:BD[25.57665] → [25.57665:57690]
```
        case MH_UNDEAD:
        case MH_DEMONIC:
```
Replacement in crawl-ref/source/fight.cc at line 1925 [7.3140790]
B:BD[25.57757] → [25.57757:57776]
```
            break;
```
[25.57757]
[25.57776]
```
        }
```
Deletion in crawl-ref/source/fight.cc at line 1927 [7.3140790]
B:BD[25.57777] → [25.57777:57813]
∅:D[25.57813] → [7.3171170:3171180]
∅:D[8.884984] → [7.3171170:3171180]
B:BD[7.3171170] → [7.3171170:3171180]
```
        default:
            break;
        }
```

Replacement in crawl-ref/source/effects.cc at line 115 [7.3382105]

B:BD[5.7303] → [5.7303:7404]

        if (mons_holiness(monster) == MH_UNDEAD
            || mons_holiness(monster) == MH_DEMONIC)

[5.7303]

[5.7404]

        if (mons_is_unholy(monster))

Replacement in crawl-ref/source/beam.cc at line 2126 [7.4128068]
B:BD[27.2424] → [27.2424:2437]
```
            
```
[27.2424]
[7.4194201]

Replacement in crawl-ref/source/beam.cc at line 2143 [7.4128068]

B:BD[12.6511] → [12.6511:6567]

            && is_mons_evil_demonic_or_undead(monster))

[12.6511]

[12.6567]

            && mons_is_evil_or_unholy(monster))

Replacement in crawl-ref/source/beam.cc at line 4219 [7.4128068]
B:BD[7.4244355] → [7.4244355:4244400]
```
    if (beam.flavour == BEAM_ENSLAVE_UNDEAD 
```
[7.4244355]
[8.1251591]
```
    if (beam.flavour == BEAM_ENSLAVE_UNDEAD
```

Clean up holiness handling, as well as a few other miscellaneous things.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.cc at line 1218 [7.16817]

Deletion in crawl-ref/source/spells2.cc at line 1072 [7.569242]

Replacement in crawl-ref/source/spells2.cc at line 1073 [7.569242]

Replacement in crawl-ref/source/religion.cc at line 1670 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 3535 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 3547 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 3550 [7.804403]

Replacement in crawl-ref/source/religion.cc at line 3558 [7.804403]

Replacement in crawl-ref/source/monstuff.cc at line 473 [7.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 483 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 706 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 721 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 803 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 811 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 824 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 828 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 830 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 833 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 844 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 5148 [7.1396662]

Insertion in crawl-ref/source/mon-util.h at line 636 [7.1682293]

Replacement in crawl-ref/source/mon-util.cc at line 882 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1008 [7.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 1015 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1017 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1054 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1059 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1066 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1068 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2024 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2041 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3151 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3169 [7.1699344]

Deletion in crawl-ref/source/mon-util.cc at line 3171 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3172 [7.1699344]

Replacement in crawl-ref/source/mon-data.h at line 46 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 53 [7.1826214]

Replacement in crawl-ref/source/mon-data.h at line 84 [7.1826214]

Deletion in crawl-ref/source/makeitem.cc at line 2856 [23.927]

Replacement in crawl-ref/source/makeitem.cc at line 2857 [23.927]

Replacement in crawl-ref/source/fight.cc at line 1921 [7.3140790]

Deletion in crawl-ref/source/fight.cc at line 1924 [7.3140790]

Replacement in crawl-ref/source/fight.cc at line 1925 [7.3140790]

Deletion in crawl-ref/source/fight.cc at line 1927 [7.3140790]

Replacement in crawl-ref/source/effects.cc at line 115 [7.3382105]

Replacement in crawl-ref/source/beam.cc at line 2126 [7.4128068]

Replacement in crawl-ref/source/beam.cc at line 2143 [7.4128068]

Replacement in crawl-ref/source/beam.cc at line 4219 [7.4128068]