fiddlerwoaroof/crawl - Change MFOXVZEY4AR3FDNGKAIB7YSXWTE6DOUXPS7UGSJGSBIK7VCRWLKAC

Rename cleansing flame resistance to holy energy resistance, and clean

up holy wrath weapon checks.

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

Created by dolorous on January 19, 2009

MFOXVZEY4AR3FDNGKAIB7YSXWTE6DOUXPS7UGSJGSBIK7VCRWLKAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/player.cc at line 6830 [5.962854]

B:BD[4.2615] → [2.2612:2673]

int player::res_cleansing_flame(const actor *attacker) const

[4.2615]

[4.2655]

int player::res_holy_energy(const actor *attacker) const

Replacement in crawl-ref/source/ouch.cc at line 223 [5.1104358]

B:BD[4.2873] → [2.2689:2765]

        const int rcf = you.res_cleansing_flame(NULL);
        if (rcf > 0)

[4.2873]

[6.361757]

        const int rhe = you.res_holy_energy(NULL);
        if (rhe > 0)

Replacement in crawl-ref/source/ouch.cc at line 226 [5.1104358]
B:BD[6.361781] → [2.2766:2793]
```
        else if (rcf == 0)
```
[6.361781]
[4.2966]
```
        else if (rhe == 0)
```
Replacement in crawl-ref/source/ouch.cc at line 228 [5.1104358]
B:BD[4.2991] → [2.2794:2821]
```
        else if (rcf < -1)
```
[4.2991]
[7.2956]
```
        else if (rhe < -1)
```

Replacement in crawl-ref/source/mon-util.cc at line 5796 [5.1699344]

B:BD[4.3064] → [2.2854:2917]

int monsters::res_cleansing_flame(const actor *attacker) const

[4.3064]

[4.3106]

int monsters::res_holy_energy(const actor *attacker) const

Insertion in crawl-ref/source/fight.h at line 203 [5.3139131]
[8.54942]
[8.54942]
```
    bool defender_is_unholy();
```

Insertion in crawl-ref/source/fight.cc at line 2051 [5.3140790]

[5.3170146]

[8.58474]

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 2779 [5.3140790]
B:BD[9.57517] → [10.4828:4925]
∅:D[10.4925] → [5.3171077:3171087]
∅:D[11.5764] → [5.3171077:3171087]
∅:D[9.57553] → [5.3171077:3171087]
∅:D[8.60044] → [5.3171077:3171087]
B:BD[5.3171077] → [5.3171077:3171087]
```
        if (defender->holiness() == MH_UNDEAD
            || defender->holiness() == MH_DEMONIC)
        {
```
[9.57517]
[9.57690]
```
        if (defender_is_unholy())
```
Deletion in crawl-ref/source/fight.cc at line 2781 [5.3140790]
B:BD[9.57757] → [11.5765:5775]
```
        }
```

Replacement in crawl-ref/source/externs.h at line 389 [5.3270163]

B:BD[12.4085] → [2.3056:3126]

    virtual int res_cleansing_flame(const actor *attacker) const = 0;

[12.4085]

[8.85779]

    virtual int res_holy_energy(const actor *attacker) const = 0;

Replacement in crawl-ref/source/externs.h at line 1097 [5.3270163]
B:BD[12.4120] → [2.3127:3177]
```
    int res_cleansing_flame(const actor *) const;
```
[12.4120]
[8.87394]
```
    int res_holy_energy(const actor *) const;
```
Replacement in crawl-ref/source/externs.h at line 1472 [5.3270163]
B:BD[12.4155] → [2.3178:3228]
```
    int res_cleansing_flame(const actor *) const;
```
[12.4155]
[8.88897]
```
    int res_holy_energy(const actor *) const;
```

Replacement in crawl-ref/source/effects.cc at line 125 [5.3382105]

B:BD[13.4163] → [14.7310:7372]

∅:D[14.7372] → [15.2737:2846]

B:BD[15.2737] → [15.2737:2846]

    if (!monster->alive()
        || !mons_is_unholy(monster)
        || (is_good_god(you.religion)
            && (is_follower(monster) || mons_neutral(monster))))
    {

[13.4163]

[13.4257]

    if (!monster->alive() || mons_res_holy_energy(monster) > 0)

Deletion in crawl-ref/source/effects.cc at line 127 [5.3382105]
B:BD[13.4280] → [15.2847:2853]
```
    }
```

Replacement in crawl-ref/source/beam.cc at line 2262 [5.4128068]

B:BD[4.3958] → [2.3360:3450]

        const int rcf = monster->res_cleansing_flame(pbolt.agent());
        if (rcf > 0)

[4.3958]

[16.3351]

        const int rhe = monster->res_holy_energy(pbolt.agent());
        if (rhe > 0)

Replacement in crawl-ref/source/beam.cc at line 2265 [5.4128068]
B:BD[16.3375] → [2.3451:3478]
```
        else if (rcf == 0)
```
[16.3375]
[4.4061]
```
        else if (rhe == 0)
```
Replacement in crawl-ref/source/beam.cc at line 2267 [5.4128068]
B:BD[4.4086] → [2.3479:3506]
```
        else if (rcf < -1)
```
[4.4086]
[7.3392]
```
        else if (rhe < -1)
```

Replacement in crawl-ref/source/beam.cc at line 3210 [5.4128068]

B:BD[17.4960] → [2.3514:3570]

        return (mon->res_cleansing_flame(agent()) > 0);

[17.4960]

[17.5105]

        return (mon->res_holy_energy(agent()) > 0);

Replacement in crawl-ref/source/beam.cc at line 5368 [5.4128068]

B:BD[3.2905] → [3.2905:2962]

        return (mon->res_cleansing_flame(agent()) <= 0);

[3.2905]

[3.2962]

        return (mon->res_holy_energy(agent()) <= 0);

Replacement in crawl-ref/source/beam.cc at line 5599 [5.4128068]
B:BD[18.9425] → [18.9425:9467]
```
    case BEAM_HOLY: return("holy power");
```
[18.9425]
[18.9467]
```
    case BEAM_HOLY: return("holy energy");
```

Rename cleansing flame resistance to holy energy resistance, and clean

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/player.cc at line 6830 [5.962854]

Replacement in crawl-ref/source/ouch.cc at line 223 [5.1104358]

Replacement in crawl-ref/source/ouch.cc at line 226 [5.1104358]

Replacement in crawl-ref/source/ouch.cc at line 228 [5.1104358]

Replacement in crawl-ref/source/mon-util.cc at line 5796 [5.1699344]

Insertion in crawl-ref/source/fight.h at line 203 [5.3139131]

Insertion in crawl-ref/source/fight.cc at line 2051 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 2779 [5.3140790]

Deletion in crawl-ref/source/fight.cc at line 2781 [5.3140790]

Replacement in crawl-ref/source/externs.h at line 389 [5.3270163]

Replacement in crawl-ref/source/externs.h at line 1097 [5.3270163]

Replacement in crawl-ref/source/externs.h at line 1472 [5.3270163]

Replacement in crawl-ref/source/effects.cc at line 125 [5.3382105]

Deletion in crawl-ref/source/effects.cc at line 127 [5.3382105]

Replacement in crawl-ref/source/beam.cc at line 2262 [5.4128068]

Replacement in crawl-ref/source/beam.cc at line 2265 [5.4128068]

Replacement in crawl-ref/source/beam.cc at line 2267 [5.4128068]

Replacement in crawl-ref/source/beam.cc at line 3210 [5.4128068]

Replacement in crawl-ref/source/beam.cc at line 5368 [5.4128068]

Replacement in crawl-ref/source/beam.cc at line 5599 [5.4128068]