fiddlerwoaroof/crawl - Change XJZXBPVEV3HQIWKQ5UYSEMQQ26C4N7QYW23ZIIXMUR2I2S73LUYAC

Fix [2575361]: Properly differentiate between spells a god hates in

general and spells a god dislikes for the purpose of artefact spellbooks, in order to avoid e.g. Elyvilon's hating a book of conjurations.

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

Created by dolorous on February 7, 2009

XJZXBPVEV3HQIWKQ5UYSEMQQ26C4N7QYW23ZIIXMUR2I2S73LUYAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-book.cc at line 2040 [5.397614]

B:BD[4.757] → [4.757:861]

    // Eliminate disciplines that the god disapproves of or from which
    // all spells are discarded.

[4.757]

[4.861]

    // Eliminate disciplines that the god dislikes or from which all
    // spells are discarded.

Replacement in crawl-ref/source/religion.h at line 124 [5.800304]
B:BD[6.3403] → [6.3403:3454]
```
bool god_dislikes_spellbook(const item_def& item);
```
[6.3403]
[6.3454]
```
bool god_hates_spellbook(const item_def& item);
```

Replacement in crawl-ref/source/religion.h at line 128 [5.800304]

B:BD[6.3577] → [6.3577:3622]

∅:D[6.3622] → [7.2540:2600]

∅:D[8.10962] → [7.2540:2600]

B:BD[9.2598] → [7.2540:2600]

∅:D[7.2600] → [10.2860:2915]

B:BD[9.2598] → [10.2860:2915]

bool god_dislikes_rod(const item_def& item);
bool good_god_dislikes_item_handling(const item_def &item);
bool god_dislikes_item_handling(const item_def &item);

[6.3577]

[11.15805]

bool god_hates_rod(const item_def& item);
bool good_god_hates_item_handling(const item_def &item);
bool god_hates_item_handling(const item_def &item);
bool god_hates_spell_type(spell_type spell, god_type god = you.religion);

Replacement in crawl-ref/source/religion.cc at line 3600 [5.804403]
B:BD[6.6471] → [6.6471:6521]
```
bool god_dislikes_spellbook(const item_def& item)
```
[6.6471]
[6.6521]
```
bool god_hates_spellbook(const item_def& item)
```

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

B:BD[6.6523] → [6.6523:6593]

    return (is_spellbook_type(item, false, god_dislikes_spell_type));

[6.6523]

[6.6593]

    return (is_spellbook_type(item, false, god_hates_spell_type));

Replacement in crawl-ref/source/religion.cc at line 3620 [5.804403]
B:BD[6.6911] → [6.6911:6955]
```
bool god_dislikes_rod(const item_def& item)
```
[6.6911]
[6.6955]
```
bool god_hates_rod(const item_def& item)
```

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

B:BD[6.6957] → [6.6957:7026]

    return (is_spellbook_type(item, true, god_dislikes_spell_type));

[6.6957]

[6.7026]

    return (is_spellbook_type(item, true, god_hates_spell_type));

Replacement in crawl-ref/source/religion.cc at line 3625 [5.804403]
∅:D[6.7029] → [7.2602:2661]
B:BD[12.4300] → [7.2602:2661]
```
bool good_god_dislikes_item_handling(const item_def &item)
```
[6.7029]
[7.2661]
```
bool good_god_hates_item_handling(const item_def &item)
```
Replacement in crawl-ref/source/religion.cc at line 3631 [5.804403]
∅:D[7.2787] → [10.2917:2971]
B:BD[12.4300] → [10.2917:2971]
```
bool god_dislikes_item_handling(const item_def &item)
```
[7.2787]
[10.2971]
```
bool god_hates_item_handling(const item_def &item)
```
Deletion in crawl-ref/source/religion.cc at line 3633 [5.804403]
B:BD[10.2973] → [3.2596:2654]
```
    if (you.religion == GOD_XOM)
        return (false);
```

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

B:BD[11.16018] → [6.7779:7843]

    if (god_dislikes_spellbook(item) || god_dislikes_rod(item))

[11.16018]

[6.7843]

    if (god_hates_spellbook(item) || god_hates_rod(item))

Replacement in crawl-ref/source/religion.cc at line 3698 [5.804403]
B:BD[11.16041] → [11.16041:16102]
```
bool god_dislikes_spell_type(spell_type spell, god_type god)
```
[11.16041]
[11.16102]
```
bool god_hates_spell_type(spell_type spell, god_type god)
```
Deletion in crawl-ref/source/religion.cc at line 3703 [5.804403]
B:BD[11.16156] → [13.13889:13944]
```
    unsigned int flags       = get_spell_flags(spell);
```

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

B:BD[11.16582] → [11.16582:16690]

B:BD[11.16690] → [13.14080:14153]

        // TSO dislikes using poison, but is fine with curing it, resisting
        // it or destroying it.
        if ((disciplines & SPTYP_POISON) && spell != SPELL_CURE_POISON_I

[11.16582]

[11.16759]

        // TSO hates using poison, but is fine with curing it, resisting
        // it, or destroying it.
        if ((disciplines & SPTYP_POISON)     && spell != SPELL_CURE_POISON_I

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

B:BD[11.16929] → [11.16929:17002]

        // He probably also wouldn't like spells which would put enemies

[11.16929]

[11.17002]

    case GOD_YREDELEMNUL:
        if (is_holy_spell(spell))
            return (true);
        break;
    default:
        break;
    }
    return (false);
}
bool god_dislikes_spell_type(spell_type spell, god_type god)
{
    if (god_hates_spell_type(spell, god))
        return (true);
    unsigned int flags       = get_spell_flags(spell);
    unsigned int disciplines = get_spell_disciplines(spell);
    switch (god)
    {
    case GOD_SHINING_ONE:
        // TSO probably wouldn't like spells which would put enemies

Deletion in crawl-ref/source/religion.cc at line 3755 [5.804403]
B:BD[11.17337] → [11.17337:17363]
B:BD[11.17363] → [6.7998:8032]
∅:D[6.8032] → [11.17397:17440]
∅:D[13.14192] → [11.17397:17440]
B:BD[11.17397] → [11.17397:17440]
```
    case GOD_YREDELEMNUL:
        if (is_holy_spell(spell))
            return (true);
        break;
```

Replacement in crawl-ref/source/itemname.cc at line 2673 [5.2667494]

B:BD[14.2920] → [7.2916:3013]

    if (good_god_dislikes_item_handling(item)
        || god_dislikes_item_handling(item))
    {

[14.2920]

[14.2977]

    if (good_god_hates_item_handling(item) || god_hates_item_handling(item))

Deletion in crawl-ref/source/itemname.cc at line 2675 [5.2667494]
B:BD[14.3018] → [7.3014:3020]
```
    }
```
Replacement in crawl-ref/source/describe.cc at line 2171 [5.3736416]
B:BD[7.3066] → [7.3066:3113]
```
    if (good_god_dislikes_item_handling(item))
```
[7.3066]
[7.3113]
```
    if (good_god_hates_item_handling(item))
```
Replacement in crawl-ref/source/describe.cc at line 2176 [5.3736416]
B:BD[15.6999] → [2.2686:2733]
```
    else if (god_dislikes_item_handling(item))
```
[15.6999]
[15.7090]
```
    else if (god_hates_item_handling(item))
```

Fix [2575361]: Properly differentiate between spells a god hates in

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spl-book.cc at line 2040 [5.397614]

Replacement in crawl-ref/source/religion.h at line 124 [5.800304]

Replacement in crawl-ref/source/religion.h at line 128 [5.800304]

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

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

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

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

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

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

Deletion in crawl-ref/source/religion.cc at line 3633 [5.804403]

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

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

Deletion in crawl-ref/source/religion.cc at line 3703 [5.804403]

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

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

Deletion in crawl-ref/source/religion.cc at line 3755 [5.804403]

Replacement in crawl-ref/source/itemname.cc at line 2673 [5.2667494]

Deletion in crawl-ref/source/itemname.cc at line 2675 [5.2667494]

Replacement in crawl-ref/source/describe.cc at line 2171 [5.3736416]

Replacement in crawl-ref/source/describe.cc at line 2176 [5.3736416]