fiddlerwoaroof/crawl - Change 3NWBNYOBOSOGZMKDHFJKLL3ZDUXGXFU7OEOSLL26KPC3S3DRNHUAC

Generalize the check for unchivalric attacks via cleansing flame.

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

Created by dolorous on January 17, 2009

3NWBNYOBOSOGZMKDHFJKLL3ZDUXGXFU7OEOSLL26KPC3S3DRNHUAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/player.cc at line 6830 [4.962854]
B:BD[3.2615] → [3.2615:2655]
```
int player::res_cleansing_flame() const
```
[3.2615]
[3.2655]
```
int player::res_cleansing_flame(const actor *attacker) const
```
Insertion in crawl-ref/source/ouch.cc at line 221 [4.1104358]
[5.361645]
[3.2845]
```
    {
```

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

B:BD[3.2873] → [3.2873:2916]

        if (you.res_cleansing_flame() > 0)

[3.2873]

[5.361757]

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

Replacement in crawl-ref/source/ouch.cc at line 226 [4.1104358]
B:BD[5.361781] → [3.2917:2966]
```
        else if (you.res_cleansing_flame() == 0)
```
[5.361781]
[3.2966]
```
        else if (rcf == 0)
```
Replacement in crawl-ref/source/ouch.cc at line 228 [4.1104358]
B:BD[3.2991] → [3.2991:3040]
```
        else if (you.res_cleansing_flame() < -1)
```
[3.2991]
[6.2956]
```
        else if (rcf < -1)
```
Insertion in crawl-ref/source/ouch.cc at line 234 [4.1104358]
[5.361806]
[7.4787]
```
    }
```
Replacement in crawl-ref/source/ouch.cc at line 241 [4.1104358]
B:BD[4.1109650] → [4.1109650:1109710]
```
}                               // end check_your_resists()
```
[4.1109650]
[4.1109710]
```
}
```
Replacement in crawl-ref/source/mon-util.cc at line 5798 [4.1699344]
B:BD[3.3064] → [3.3064:3106]
```
int monsters::res_cleansing_flame() const
```
[3.3064]
[3.3106]
```
int monsters::res_cleansing_flame(const actor *attacker) const
```

Replacement in crawl-ref/source/mon-util.cc at line 5809 [4.1699344]

∅:D[2.2733] → [3.3274:3372]

B:BD[3.3274] → [3.3274:3372]

           || you.religion == GOD_SHINING_ONE
               && is_unchivalric_attack(&you, this)

[2.2733]

[3.3372]

           || is_unchivalric_attack(attacker, this)

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

B:BD[8.4085] → [3.3611:3660]

    virtual int res_cleansing_flame() const = 0;

[8.4085]

[9.85779]

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

Replacement in crawl-ref/source/externs.h at line 1097 [4.3270163]
B:BD[8.4120] → [3.3661:3698]
```
    int res_cleansing_flame() const;
```
[8.4120]
[9.87394]
```
    int res_cleansing_flame(const actor *) const;
```
Replacement in crawl-ref/source/externs.h at line 1472 [4.3270163]
B:BD[8.4155] → [3.3699:3736]
```
    int res_cleansing_flame() const;
```
[8.4155]
[9.88897]
```
    int res_cleansing_flame(const actor *) const;
```
Insertion in crawl-ref/source/beam.cc at line 2252 [4.4128068]
[3.3930]
[3.3930]
```
    {
```

Replacement in crawl-ref/source/beam.cc at line 2254 [4.4128068]

B:BD[3.3958] → [3.3958:4006]

        if (monster->res_cleansing_flame() > 0)

[3.3958]

[10.3351]

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

Replacement in crawl-ref/source/beam.cc at line 2257 [4.4128068]
B:BD[10.3375] → [3.4007:4061]
```
        else if (monster->res_cleansing_flame() == 0)
```
[10.3375]
[3.4061]
```
        else if (rcf == 0)
```
Replacement in crawl-ref/source/beam.cc at line 2259 [4.4128068]
B:BD[3.4086] → [3.4086:4140]
```
        else if (monster->res_cleansing_flame() < -1)
```
[3.4086]
[6.3392]
```
        else if (rcf < -1)
```
Insertion in crawl-ref/source/beam.cc at line 2269 [4.4128068]
[4.4184274]
[4.4184274]
```
    }
```

Replacement in crawl-ref/source/beam.cc at line 3202 [4.4128068]

B:BD[11.4960] → [3.4141:4190]

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

[11.4960]

[11.5105]

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

Generalize the check for unchivalric attacks via cleansing flame.

Dependencies

In channels

Change contents

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

Insertion in crawl-ref/source/ouch.cc at line 221 [4.1104358]

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

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

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

Insertion in crawl-ref/source/ouch.cc at line 234 [4.1104358]

Replacement in crawl-ref/source/ouch.cc at line 241 [4.1104358]

Replacement in crawl-ref/source/mon-util.cc at line 5798 [4.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 5809 [4.1699344]

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

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

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

Insertion in crawl-ref/source/beam.cc at line 2252 [4.4128068]

Replacement in crawl-ref/source/beam.cc at line 2254 [4.4128068]

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

Replacement in crawl-ref/source/beam.cc at line 2259 [4.4128068]

Insertion in crawl-ref/source/beam.cc at line 2269 [4.4128068]

Replacement in crawl-ref/source/beam.cc at line 3202 [4.4128068]