fiddlerwoaroof/crawl - Change NDKS43E4XVAU3FDY276OF5JW7E5SF6F5EJD2XLV5JLKZ5W6N554QC

Yred flavor, part 3: forbid the use of holy items (weapons of holy wrath

and scrolls of holy word) or spells.

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

Created by dolorous on September 25, 2008

NDKS43E4XVAU3FDY276OF5JW7E5SF6F5EJD2XLV5JLKZ5W6N554QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 791 [6.293070]

∅:D[4.3380] → [5.1328:1407]

B:BD[5.1328] → [5.1328:1407]

        did_god_conduct( DID_SPELL_NONUTILITY, 10 + spell_difficulty(spell) );

[4.3380]

[7.128399]

        did_god_conduct(DID_SPELL_NONUTILITY, 10 + spell_difficulty(spell));
    if (spell_typematch(spell, SPTYP_HOLY))
        did_god_conduct(DID_HOLY, 10 + spell_difficulty(spell));

Insertion in crawl-ref/source/religion.h at line 103 [6.800304]
[8.2622]
[9.2557]
```
bool is_holy_item(const item_def& item);
```

Insertion in crawl-ref/source/religion.cc at line 665 [6.804403]

[10.8389]

        break;
    case GOD_YREDELEMNUL:
        dislikes.push_back("use holy magic or items");

Insertion in crawl-ref/source/religion.cc at line 2219 [6.804403]

[11.527]

[7.182310]

        }
        break;
    case DID_HOLY:
        if (you.religion == GOD_YREDELEMNUL)
        {
            if (!known)
            {
                simple_god_message(" did not appreciate that!");
                break;
            }
            ret = true;
            piety_change = -level;
            penance = level * 2;

Replacement in crawl-ref/source/religion.cc at line 2732 [6.804403]

B:BD[7.189728] → [12.3256:3323]

          "Necromancy", "Unholy", "Attack Holy", "Attack Neutral",

[7.189728]

[13.2587]

          "Necromancy", "Holy", "Unholy", "Attack Holy", "Attack Neutral",

Insertion in crawl-ref/source/religion.cc at line 2996 [6.804403]

[14.7334]

[15.5267]

}
bool is_holy_item(const item_def& item)
{
    bool retval = false;
    switch (item.base_type)
    {
    case OBJ_WEAPONS:
        {
        const int item_brand = get_weapon_brand(item);
        retval = (item_brand == SPWPN_HOLY_WRATH);
        break;
        }
    case OBJ_SCROLLS:
        retval = (item.sub_type == SCR_HOLY_WORD);
        break;
    default:
        break;
    }
    return (retval);

Insertion in crawl-ref/source/religion.cc at line 3135 [6.804403]

[16.3471]

[2.2788]

    if (you.religion == GOD_YREDELEMNUL)
    {
        if (!item_type_known(item))
            return (false);
        if (is_holy_item(item))
            return (true);
    }

Replacement in crawl-ref/source/item_use.cc at line 4586 [6.2781507]

B:BD[17.5010] → [3.13427:13484]

∅:D[3.13484] → [18.3156:3206]

B:BD[18.3156] → [18.3156:3206]

        if (!holy_word(pow, HOLY_WORD_SCROLL, you.pos(),
                       !item_type_known(scroll)))

[17.5010]

[18.3206]

        const bool success = holy_word(pow, HOLY_WORD_SCROLL, you.pos(),
                                       !item_type_known(scroll));
        if (!success)

Insertion in crawl-ref/source/item_use.cc at line 4602 [6.2781507]

[17.5527]

[19.8572]


        // This is only naughty if you know you're doing it, or if it's
        // succeeded, in which case you'll know for next time.
        if (item_type_known(scroll) || success)
            did_god_conduct(DID_HOLY, 10, item_type_known(scroll));

Replacement in crawl-ref/source/fight.cc at line 1755 [6.3140790]

B:BD[20.54988] → [21.399:482]

        if (weapon->base_type == OBJ_WEAPONS
            && is_demonic( *weapon ))

[20.54988]

[21.482]

        if (weapon->base_type == OBJ_WEAPONS)

Replacement in crawl-ref/source/fight.cc at line 1757 [6.3140790]

B:BD[21.492] → [21.492:536]

            did_god_conduct(DID_UNHOLY, 1);

[21.492]

[21.536]

            if (is_holy_item(*weapon))
                did_god_conduct(DID_HOLY, 1);
            if (is_demonic(*weapon))
                did_god_conduct(DID_UNHOLY, 1);

Insertion in crawl-ref/source/enum.h at line 636 [6.3287960]

[7.908205]

    DID_HOLY,                           // holy wrath wpns, holy word scrolls