fiddlerwoaroof/crawl - Change 44QCNHHLDJTDSEDN2QY4G2BWVJAS6OUA7FWVVVLTEIB2FSCQC3FAC

Add follower handling for Kiku and Yred, just in case, and revert the

last change to Trog's follower handling for now.

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

Created by dolorous on May 6, 2008

44QCNHHLDJTDSEDN2QY4G2BWVJAS6OUA7FWVVVLTEIB2FSCQC3FAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/religion.cc at line 777 [5.804403]

[3.2580]

[4.2579]

            && mons_friendly(mon));
}
bool is_undead_follower(const monsters* mon)
{
    return (mon->alive() && mons_holiness(mon) == MH_UNDEAD

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

B:BD[4.2722] → [2.2528:2617]

            && mon->attitude == ATT_FRIENDLY
            && (mon->flags & MF_GOD_GIFT));

[4.2722]

[6.2964]

            && mons_friendly(mon));

Insertion in crawl-ref/source/religion.cc at line 803 [5.804403]

[7.2685]

[4.2723]

    else if (you.religion == GOD_KIKUBAAQUDGHA
        || you.religion == GOD_YREDELEMNUL)
    {
        return is_undead_follower(mon)
            || (you.religion == GOD_KIKUBAAQUDGHA && mon->type == MONS_REAPER);
    }