fiddlerwoaroof/crawl - Change VZHWCXKKXGA6B6HQ4NFWBBOZ3MULBMSZX6CHYFBFTN3MWXKXF2PAC

Clean up follower and cleansing flame routines some more. If you

worship a good god, cleansing flame will no longer damage neutral monsters, since attacking neutrals offends the good gods.

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

Created by dolorous on April 19, 2008

VZHWCXKKXGA6B6HQ4NFWBBOZ3MULBMSZX6CHYFBFTN3MWXKXF2PAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.h at line 78 [5.800304]
B:BD[3.2615] → [4.2511:2554]
```
bool is_tso_follower(const monsters* mon);
```
[6.2593]
[6.2593]
```
bool is_good_follower(const monsters* mon);
```
Replacement in crawl-ref/source/religion.cc at line 776 [5.804403]
B:BD[7.2725] → [7.2725:2767]
```
bool is_tso_follower(const monsters* mon)
```
[7.2725]
[7.2767]
```
bool is_good_follower(const monsters* mon)
```

Replacement in crawl-ref/source/religion.cc at line 791 [5.804403]

B:BD[7.3201] → [7.3201:3226]

∅:D[7.3226] → [8.2606:2607]

B:BD[8.2606] → [8.2606:2607]

B:BD[8.2607] → [7.3227:3459]

B:BD[9.2639] → [9.2639:2698]

∅:D[9.2698] → [7.3459:3504]

B:BD[7.3459] → [7.3459:3504]

    bool result = false;
    switch (you.religion)
    {
        case GOD_SHINING_ONE:
            result = is_tso_follower(mon);
            break;
        case GOD_BEOGH:
            result = is_orcish_follower(mon);
            break;
        default:
            result = (mon->alive() && mons_friendly(mon));
            break;
    }
    return result;

[7.3201]

[7.3504]

    if (is_good_god(you.religion))
        return is_good_follower(mon);
    else if (you.religion == GOD_BEOGH)
        return is_orcish_follower(mon);
    else
        return (mon->alive() && mons_friendly(mon));

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

B:BD[10.361645] → [9.2718:2860]

        if (you.is_undead || you.species != SP_DEMONSPAWN)
            hurted = (hurted * 3) / 2;
        else if (is_good_god(you.religion))

[10.361645]

[10.361757]

        if (is_good_god(you.religion))

Insertion in crawl-ref/source/ouch.cc at line 246 [5.1104358]

[10.361781]

[9.2861]

        else if (you.is_undead || you.species != SP_DEMONSPAWN)
            hurted = (hurted * 3) / 2;

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

B:BD[5.4183880] → [9.3207:3283]

B:BD[9.3283] → [11.2750:2789]

B:BD[11.2789] → [2.33987:34058]

        if (mons_is_unholy(monster))
            hurted = (hurted * 3) / 2;
        else if (mons_is_holy(monster)
                 || is_good_god(you.religion) && is_follower(monster))

[5.4183880]

[11.2857]

        if (mons_is_holy(monster)
            || (is_good_god(you.religion)
                && (is_follower(monster) || mons_neutral(monster))))

Insertion in crawl-ref/source/beam.cc at line 1786 [5.4128068]

[11.2878]

[9.3375]

        else if (mons_is_unholy(monster))
            hurted = (hurted * 3) / 2;