fiddlerwoaroof/crawl - Change KVMJCPD4RM6YUWIMO4LDHEIB5W62MTOCGBWAEFBHNOUDYLGKXQ3QC

Generalize checks for spellbooks and rods of a particular class, or

which your god disapproves of. Now, if at least half of the spells in a spellbook or rod are in a particular class (this threshold may need adjustment; it's in is_spellbook_type()), the entire item is considered to be, too. This means that artefact spellbooks containing many evil spells may be considered evil items by good gods, as will artefact rods if/when they're implemented.

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

Created by dolorous on December 23, 2008

KVMJCPD4RM6YUWIMO4LDHEIB5W62MTOCGBWAEFBHNOUDYLGKXQ3QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-book.cc at line 985 [5.397614]
B:BD[4.1505] → [4.1505:1546]
```
    for (int i = 0; i < NUM_SPELLS; i++)
```
[4.1505]
[4.1546]
```
    for (int i = 0; i < NUM_SPELLS; ++i)
```
Replacement in crawl-ref/source/spl-book.cc at line 988 [5.397614]
B:BD[4.1580] → [3.521:567]
```
    for (int i = 0; i < NUM_FIXED_BOOKS; i++)
```
[4.1580]
[4.1620]
```
    for (int i = 0; i < NUM_FIXED_BOOKS; ++i)
```

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

B:BD[4.1852] → [4.1852:1901]

        for (int j = 0; j < SPELLBOOK_SIZE; j++)

[4.1852]

[4.1901]

        for (int j = 0; j < SPELLBOOK_SIZE; ++j)

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

B:BD[4.2050] → [4.2050:2107]

            int unsigned flags = get_spell_flags(spell);

[4.2050]

[4.2107]

            unsigned int flags = get_spell_flags(spell);

Insertion in crawl-ref/source/religion.h at line 110 [5.800304]

[6.10962]

[7.2540]

bool is_holy_discipline(int discipline);
bool is_evil_discipline(int discipline);
bool is_holy_spell(spell_type spell, god_type god = GOD_NO_GOD);
bool is_evil_spell(spell_type spell, god_type god = GOD_NO_GOD);
bool is_chaotic_spell(spell_type spell, god_type god = GOD_NO_GOD);
bool is_any_spell(spell_type spell, god_type god = GOD_NO_GOD);
bool is_spellbook_type(const item_def& item, bool book_or_rod,
                       bool (*suitable)(spell_type spell, god_type god) =
                           is_any_spell,
                       god_type god = you.religion);
bool is_holy_spellbook(const item_def& item);
bool is_evil_spellbook(const item_def& item);
bool is_chaotic_spellbook(const item_def& item);
bool god_dislikes_spellbook(const item_def& item);
bool is_holy_rod(const item_def& item);
bool is_evil_rod(const item_def& item);
bool is_chaotic_rod(const item_def& item);
bool god_dislikes_rod(const item_def& item);

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

B:BD[8.15883] → [4.13038:13154]

bool god_dislikes_spell_discipline(int discipline,
                                   god_type god = you.religion);

[8.15883]

[8.15956]

bool god_dislikes_spell_discipline(int discipline, god_type god = you.religion);

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

[9.3507]

        break;
    case OBJ_BOOKS:
        retval = is_holy_spellbook(item);
        break;
    case OBJ_STAVES:
        retval = is_holy_rod(item);

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

B:BD[10.2529] → [10.2529:2580]

B:BD[10.2580] → [11.3068:3279]

        retval = (item.sub_type == BOOK_NECROMANCY
                  || item.sub_type == BOOK_DEATH
                  || item.sub_type == BOOK_UNLIFE
                  || item.sub_type == BOOK_NECRONOMICON
                  || item.sub_type == BOOK_DEMONOLOGY);

[10.2529]

[10.2799]

        retval = is_evil_spellbook(item);

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

B:BD[12.3524] → [12.3524:3571]

B:BD[12.3571] → [11.3280:3337]

        retval = (item.sub_type == STAFF_DEATH
                  || item.sub_type == STAFF_DEMONOLOGY);

[12.3524]

[12.3623]

        retval = (item.sub_type == STAFF_DEATH || is_evil_rod(item));

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

[6.12324]

[12.3739]

    case OBJ_BOOKS:
        retval = is_chaotic_spellbook(item);
        break;
    case OBJ_STAVES:
        retval = is_chaotic_rod(item);
        break;

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

[13.2572]

[14.4297]

}
bool is_holy_discipline(int discipline)
{
    return (discipline & SPTYP_HOLY);
}
bool is_evil_discipline(int discipline)
{
    return (discipline & SPTYP_NECROMANCY);

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

[14.4299]


bool is_holy_spell(spell_type spell, god_type god)
{
    UNUSED(god);
    unsigned int disciplines = get_spell_disciplines(spell);

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

[14.4300]

[7.2602]

    return (is_holy_discipline(disciplines));
}
bool is_evil_spell(spell_type spell, god_type god)
{
    UNUSED(god);
    unsigned int flags       = get_spell_flags(spell);
    unsigned int disciplines = get_spell_disciplines(spell);
    return ((flags & SPFLAG_UNHOLY) || (is_evil_discipline(disciplines)));
}
bool is_chaotic_spell(spell_type spell, god_type god)
{
    UNUSED(god);
    return (spell == SPELL_POLYMORPH_OTHER || spell == SPELL_ALTER_SELF);
}
// The default suitable() function for is_spellbook_type().
bool is_any_spell(spell_type spell, god_type god)
{
    UNUSED(god);
    return (true);
}
// If book_or_rod is false, only look at actual spellbooks.  Otherwise,
// only look at rods.
bool is_spellbook_type(const item_def& item, bool book_or_rod,
                       bool (*suitable)(spell_type spell, god_type god),
                       god_type god)
{
    const bool is_spellbook = (item.base_type == OBJ_BOOKS
                                  && item.sub_type != BOOK_MANUAL
                                  && item.sub_type != BOOK_DESTRUCTION);
    const bool is_rod = item_is_rod(item);
    if (!is_spellbook && !is_rod)
        return (false);
    if (!book_or_rod && is_rod)
        return (false);
    int total       = 0;
    int total_liked = 0;
    for (int i = 0; i < SPELLBOOK_SIZE; ++i)
    {
        spell_type spell = which_spell_in_book(item, i);
        if (spell == SPELL_NO_SPELL)
            continue;
        total++;
        if (suitable(spell, god))
            total_liked++;
    }
    // If at least half of the available spells are suitable, the whole
    // spellbook or rod is, too.
    return (total_liked >= (total / 2) + 1);
}
bool is_holy_spellbook(const item_def& item)
{
    return (is_spellbook_type(item, false, is_holy_spell));
}
bool is_evil_spellbook(const item_def& item)
{
    return (is_spellbook_type(item, false, is_evil_spell));
}
bool is_chaotic_spellbook(const item_def& item)
{
    return (is_spellbook_type(item, false, is_chaotic_spell));
}
bool god_dislikes_spellbook(const item_def& item)
{
    return (is_spellbook_type(item, false, god_dislikes_spell_type));
}
bool is_holy_rod(const item_def& item)
{
    return (is_spellbook_type(item, true, is_holy_spell));
}
bool is_evil_rod(const item_def& item)
{
    return (is_spellbook_type(item, true, is_evil_spell));
}
bool is_chaotic_rod(const item_def& item)
{
    return (is_spellbook_type(item, true, is_chaotic_spell));
}
bool god_dislikes_rod(const item_def& item)
{
    return (is_spellbook_type(item, true, god_dislikes_spell_type));
}

Replacement in crawl-ref/source/religion.cc at line 3556 [5.804403]
B:BD[15.2973] → [16.33219:33253]
```
    if (you.religion == GOD_TROG)
```
[15.2973]
[16.33253]
```
    switch (you.religion)
```

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

B:BD[16.33259] → [16.33259:33351]

B:BD[16.33351] → [17.2529:2584]

B:BD[17.2584] → [18.2585:2631]

        return (item.base_type == OBJ_BOOKS
                && item.sub_type != BOOK_MANUAL
                && item.sub_type != BOOK_DESTRUCTION);
    }
    if (you.religion == GOD_ZIN)
    {

[16.33259]

[6.12429]

    case GOD_ZIN:

Replacement in crawl-ref/source/religion.cc at line 3561 [5.804403]
∅:D[17.2584] → [16.33454:33460]
∅:D[18.2772] → [16.33454:33460]
B:BD[16.33454] → [16.33454:33460]
```
    }
```
[19.2571]
[16.33460]
```
        break;
```
Replacement in crawl-ref/source/religion.cc at line 3563 [5.804403]
B:BD[16.33461] → [20.2889:2930]
```
    if (you.religion == GOD_SHINING_ONE)
```
[16.33461]
[20.2930]
```
    case GOD_SHINING_ONE:
```
Replacement in crawl-ref/source/religion.cc at line 3568 [5.804403]
∅:D[13.2823] → [20.2936:2979]
B:BD[20.2936] → [20.2936:2979]
```
        if (item.base_type == OBJ_WEAPONS)
```
[13.2823]
[20.2979]
```
        switch (item.base_type)
        {
        case OBJ_WEAPONS:
```
Deletion in crawl-ref/source/religion.cc at line 3573 [5.804403]
B:BD[20.3048] → [20.3048:3049]
Insertion in crawl-ref/source/religion.cc at line 3575 [5.804403]
[20.3123]
[20.3123]
```
            break;
```
Replacement in crawl-ref/source/religion.cc at line 3577 [5.804403]
B:BD[20.3133] → [20.3133:3182]
```
        else if (item.base_type == OBJ_MISSILES)
```
[20.3133]
[20.3182]
```
        case OBJ_MISSILES:
```
Deletion in crawl-ref/source/religion.cc at line 3581 [5.804403]
∅:D[2.2591] → [20.3251:3252]
B:BD[20.3251] → [20.3251:3252]
Deletion in crawl-ref/source/religion.cc at line 3582 [5.804403]
B:BD[21.2670] → [6.12490:12504]
```
            {
```
Replacement in crawl-ref/source/religion.cc at line 3583 [5.804403]
B:BD[20.3440] → [6.12505:12519]
```
            }
```
[20.3440]
[20.3454]
```
            break;
```

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

B:BD[20.3464] → [22.2637:2683]

B:BD[22.2683] → [21.2671:2777]

∅:D[21.2777] → [22.2761:2798]

B:BD[22.2761] → [22.2761:2798]

        else if (item.base_type == OBJ_STAVES
                 && (item.sub_type == STAFF_POISON
                     || item.sub_type == STAFF_VENOM))
        {
            return (true);

[20.3464]

[22.2798]


        case OBJ_STAVES:
            if (item.sub_type == STAFF_POISON)
                return (true);
            break;
        default:
            break;

Insertion in crawl-ref/source/religion.cc at line 3594 [5.804403]
[22.2808]
[20.3464]
```
        break;
```

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

B:BD[20.3471] → [9.3579:3690]

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

[20.3471]

[9.3690]

    case GOD_YREDELEMNUL:
        if (item_type_known(item) && is_holy_item(item))
            return (true);
        break;

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

B:BD[9.3691] → [9.3691:3723]

        if (is_holy_item(item))

[9.3691]

[8.15984]

    case GOD_TROG:
        if (item.base_type == OBJ_BOOKS
            && item.sub_type != BOOK_MANUAL
            && item.sub_type != BOOK_DESTRUCTION)
        {

Insertion in crawl-ref/source/religion.cc at line 3608 [5.804403]
[8.16011]
[8.16011]
```
        }
        break;
    default:
        break;
```

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

[8.16018]

    if (god_dislikes_spellbook(item) || god_dislikes_rod(item))
        return (true);

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

B:BD[8.16104] → [8.16104:16155]

    if (god == GOD_NO_GOD)
        return (false);

[8.16104]

[8.16155]

    if (is_good_god(god) && is_evil_spell(spell))
        return (true);

Replacement in crawl-ref/source/religion.cc at line 3629 [5.804403]
B:BD[8.16265] → [8.16265:16297]
B:BD[8.16297] → [4.14006:14079]
∅:D[4.14079] → [8.16366:16416]
B:BD[8.16366] → [8.16366:16416]
```
    if (is_good_god(god))
    {
        if ((flags & SPFLAG_UNHOLY) || (disciplines & SPTYP_NECROMANCY))
            return (true);
    }
    switch(god)
```
[8.16265]
[8.16416]
```
    switch (god)
```

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

B:BD[8.16440] → [8.16440:16513]

        if (spell == SPELL_POLYMORPH_OTHER || spell == SPELL_ALTER_SELF)

[8.16440]

[8.16513]

        if (is_chaotic_spell(spell))

Replacement in crawl-ref/source/religion.cc at line 3657 [5.804403]
B:BD[8.17363] → [4.14154:14192]
```
        if (disciplines & SPTYP_HOLY)
```
[8.17363]
[8.17397]
```
        if (is_holy_spell(spell))
```
Replacement in crawl-ref/source/religion.cc at line 3691 [5.804403]
B:BD[8.18449] → [8.18449:18474]
```
            return true;
```
[8.18449]
[8.18474]
```
            return (true);
```
Deletion in crawl-ref/source/religion.cc at line 3704 [5.804403]
B:BD[4.14519] → [4.14519:14520]
∅:D[4.14520] → [8.18579:18630]
B:BD[8.18579] → [8.18579:18630]
```
    if (god == GOD_NO_GOD)
        return (false);
```

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

B:BD[8.18631] → [4.14521:14582]

    if (is_good_god(god) && (discipline & SPTYP_NECROMANCY))

[8.18631]

[8.18687]

    if (is_good_god(god) && is_evil_discipline(discipline))

Replacement in crawl-ref/source/religion.cc at line 3708 [5.804403]
B:BD[15.3259] → [8.18711:18727]
```
    switch(god)
```
[15.3259]
[8.18727]
```
    switch (god)
```

Generalize checks for spellbooks and rods of a particular class, or

Dependencies

In channels

Change contents

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

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

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

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

Insertion in crawl-ref/source/religion.h at line 110 [5.800304]

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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