fiddlerwoaroof/crawl - Change 5SKXI22WN2Y4SWUG634WDB7QXLBNV54RPN5OHAXRI55OFM5YBF5QC

Mark potions of mutation as evil for Zin worshippers, and poisoned

weapons and ammunition as evil for TSO worshippers. Also, mark all demonic weapons as evil, whether their types are known or not.

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

Created by dolorous on June 29, 2008

5SKXI22WN2Y4SWUG634WDB7QXLBNV54RPN5OHAXRI55OFM5YBF5QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 2974 [4.804403]

B:BD[3.2733] → [3.2733:2838]

        int item_brand = get_weapon_brand(item);
        int item_eff = item_special_wield_effect(item);

[3.2733]

[5.750]

        const int item_brand = get_weapon_brand(item);
        const int item_eff = item_special_wield_effect(item);

Replacement in crawl-ref/source/religion.cc at line 3032 [4.804403]

B:BD[2.2631] → [2.2631:2725]

        if (item.base_type == OBJ_WANDS
            && item.sub_type == WAND_POLYMORPH_OTHER)

[2.2631]

[2.2725]

        if (((item.base_type == OBJ_POTIONS
                && item.sub_type == POT_MUTATION)
            || (item.base_type == OBJ_WANDS
                && item.sub_type == WAND_POLYMORPH_OTHER))
            && item_type_known(item));

Insertion in crawl-ref/source/religion.cc at line 3042 [4.804403]

[6.33461]

    if (you.religion == GOD_SHINING_ONE)
    {
        if (item.base_type == OBJ_WEAPONS)
        {
            const int item_brand = get_weapon_brand(item);
            if (item_brand == SPWPN_VENOM)
                return (true);
        }
        else if (item.base_type == OBJ_MISSILES)
        {
            const int item_brand = get_weapon_brand(item);
            if (item_brand == SPMSL_POISONED
                || item_brand == SPMSL_POISONED_II
                || item_brand == SPMSL_CURARE)
            {
                return (true);
            }
        }
    }

Replacement in crawl-ref/source/religion.cc at line 3065 [4.804403]

B:BD[6.33521] → [6.33521:33560]

            && item_type_known(item));

[6.33521]

[7.3256]

            && (is_demonic(item) || item_type_known(item)));