fiddlerwoaroof/crawl - Change QO5ZJWQ3JK3PEGBPTQSAYIPEJEHG2M2KTD74227G5VG7DVXUL3BQC

Non-weighted themed randart spellbooks, and prices for randart spellbooks.

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

Created by zelgadis on December 5, 2008

QO5ZJWQ3JK3PEGBPTQSAYIPEJEHG2M2KTD74227G5VG7DVXUL3BQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spl-util.h at line 97 [5.242902]
[4.203]
[5.244239]
```
bool disciplines_conflict(unsigned int disc1, unsigned int disc2);
```

Insertion in crawl-ref/source/spl-util.cc at line 392 [5.245665]

[5.250845]


// NOTE: Assumes that any single spell won't belong to conflicting
// disciplines.
bool disciplines_conflict(unsigned int disc1, unsigned int disc2)
{
    const unsigned int combined = disc1 | disc2;

Insertion in crawl-ref/source/spl-util.cc at line 399 [5.245665]

[5.250846]

[6.2453]

    return (   (combined & SPTYP_EARTH) && (combined & SPTYP_AIR)
            || (combined & SPTYP_FIRE)  && (combined & SPTYP_ICE)
            || (combined & SPTYP_HOLY)  && (combined & SPTYP_NECROMANCY));
}

Replacement in crawl-ref/source/spl-data.h at line 569 [5.268152]
B:BD[5.277426] → [7.1602:1620]
```
     SPFLAG_AREA,
```
[5.277426]
[8.1223]
```
     SPFLAG_AREA | SPFLAG_BATTLE,
```
Replacement in crawl-ref/source/spl-data.h at line 724 [5.268152]
∅:D[9.350] → [5.278400:278422]
B:BD[5.278400] → [5.278400:278422]
B:BD[5.278422] → [10.120958:120976]
```
     SPTYP_SUMMONING,
     SPFLAG_NONE,
```
[9.350]
[8.1470]
```
     SPTYP_SUMMONING ,
     SPFLAG_BATTLE,
```
Replacement in crawl-ref/source/spl-data.h at line 749 [5.268152]
B:BD[5.278593] → [10.120996:121014]
```
     SPFLAG_NONE,
```
[5.278593]
[8.1508]
```
     SPFLAG_BATTLE,
```
Replacement in crawl-ref/source/spl-data.h at line 871 [5.268152]
B:BD[5.279630] → [10.121222:121240]
```
     SPFLAG_NONE,
```
[5.279630]
[8.1729]
```
     SPFLAG_BATTLE,
```
Replacement in crawl-ref/source/spl-data.h at line 883 [5.268152]
B:BD[5.279725] → [10.121241:121261]
```
     SPFLAG_UNHOLY,
```
[5.279725]
[8.1748]
```
     SPFLAG_UNHOLY | SPFLAG_BATTLE,
```
Replacement in crawl-ref/source/spl-data.h at line 1002 [5.268152]
B:BD[5.280533] → [10.121530:121548]
```
     SPFLAG_NONE,
```
[5.280533]
[8.1938]
```
     SPFLAG_BATTLE,
```
Replacement in crawl-ref/source/spl-data.h at line 1062 [5.268152]
B:BD[5.280925] → [10.121666:121684]
```
     SPFLAG_NONE,
```
[5.280925]
[8.2069]
```
     SPFLAG_BATTLE,
```
Replacement in crawl-ref/source/spl-data.h at line 1098 [5.268152]
B:BD[5.281200] → [10.121732:121750]
```
     SPFLAG_NONE,
```
[5.281200]
[8.2126]
```
     SPFLAG_BATTLE,
```
Replacement in crawl-ref/source/spl-data.h at line 1122 [5.268152]
B:BD[5.281363] → [10.121770:121790]
```
     SPFLAG_UNHOLY,
```
[5.281363]
[8.2164]
```
     SPFLAG_UNHOLY | SPFLAG_BATTLE,
```
Replacement in crawl-ref/source/spl-data.h at line 1387 [5.268152]
B:BD[5.283048] → [10.122265:122285]
```
     SPFLAG_UNHOLY,
```
[5.283048]
[8.2525]
```
     SPFLAG_UNHOLY | SPFLAG_BATTLE,
```
Replacement in crawl-ref/source/spl-data.h at line 1399 [5.268152]
B:BD[5.283125] → [10.122286:122306]
```
     SPFLAG_UNHOLY,
```
[5.283125]
[8.2544]
```
     SPFLAG_UNHOLY | SPFLAG_BATTLE,
```
Replacement in crawl-ref/source/spl-data.h at line 1411 [5.268152]
B:BD[5.283216] → [10.122307:122327]
```
     SPFLAG_UNHOLY,
```
[5.283216]
[8.2563]
```
     SPFLAG_UNHOLY | SPFLAG_BATTLE,
```
Replacement in crawl-ref/source/spl-data.h at line 2012 [5.268152]
B:BD[5.287794] → [10.123539:123557]
```
     SPFLAG_NONE,
```
[5.287794]
[8.3575]
```
     SPFLAG_BATTLE,
```
Replacement in crawl-ref/source/spl-data.h at line 2408 [5.268152]
B:BD[11.4272] → [11.4272:4292]
```
     SPFLAG_TARGET,
```
[11.4272]
[11.4292]
```
     SPFLAG_TARGET | SPFLAG_BATTLE,
```
Insertion in crawl-ref/source/spl-book.h at line 15 [5.395672]
[5.395943]
[12.1285]
```
#define SPELLBOOK_SIZE 8
```

Replacement in crawl-ref/source/spl-book.h at line 31 [5.395672]

B:BD[5.396336] → [13.821:864]

int book_rarity(unsigned char which_book);

[5.396336]

[5.396380]

int  book_rarity(unsigned char which_book);
int  spell_rarity(spell_type which_spell);
void init_spell_rarities();

Deletion in crawl-ref/source/spl-book.h at line 35 [5.395672]
B:BD[5.396381] → [5.396381:396382]

Replacement in crawl-ref/source/spl-book.h at line 74 [5.395672]

B:BD[3.5159] → [3.5159:5228]

                             int school_one = 0, int school_two = 0,

[3.5159]

[3.5228]

                             int disc1 = 0, int disc2 = 0,

Insertion in crawl-ref/source/spl-book.h at line 76 [5.395672]
[3.5300]
[5.397570]
```
bool book_has_title(const item_def &book);
```
Deletion in crawl-ref/source/spl-book.cc at line 50 [5.397614]
B:BD[5.398461] → [14.78:103]
```
#define SPELLBOOK_SIZE 8
```

Insertion in crawl-ref/source/spl-book.cc at line 962 [5.397614]

[2.269]

[5.420674]


static unsigned char _lowest_rarity[NUM_SPELLS];
void init_spell_rarities()
{
    for (int i = 0; i < NUM_SPELLS; i++)
        _lowest_rarity[i] = 255;
    for (int i = 0; i < NUM_BOOKS; i++)
    {
        const int rarity = book_rarity(i);
        // Manuals, books of destruction, books only created as gifts
        // from specific gods, and the unused Book of Healing.
        if (rarity >= 20)
            continue;
        for (int j = 0; j < SPELLBOOK_SIZE; j++)
        {
            spell_type spell = which_spell_in_book(i, j);
            if (spell == SPELL_NO_SPELL)
                continue;
#ifdef DEBUG
            int unsigned flags = get_spell_flags(spell);
            if (flags & (SPFLAG_MONSTER | SPFLAG_TESTING))
            {
                item_def item;
                item.base_type = OBJ_BOOKS;
                item.sub_type  = i;
                end(1, false, "Spellbook '%s' contains invalid spell "
                             "'%s'",
                    item.name(DESC_PLAIN, false, true).c_str(),
                    spell_title(spell));
            }
#endif

Insertion in crawl-ref/source/spl-book.cc at line 1001 [5.397614]

[5.420675]

[12.2010]

            if (rarity < _lowest_rarity[spell])
                _lowest_rarity[spell] = rarity;
        }
    }
}
int spell_rarity(spell_type which_spell)
{
    const int rarity = _lowest_rarity[which_spell];
    if (rarity == 255)
        return (-1);
    return (rarity);
}

Insertion in crawl-ref/source/spl-book.cc at line 1702 [5.397614]

[3.7668]

static void _get_spell_list(std::vector<spell_type> &spell_list, int level,
                            unsigned int disc1, unsigned int disc2,
                            god_type god, bool avoid_uncastable,
                            int &god_discard, int &uncastable_discard)
{
    for (int i = 0; i < NUM_SPELLS; i++)
    {
        const spell_type spell = (spell_type) i;
        if (!is_valid_spell(spell))
            continue;
        // Only use spells available in books you might find laying about
        // the dungeon.
        if (spell_rarity(spell) == -1)
            continue;
        const unsigned int disciplines = get_spell_disciplines(spell);
        if (level != -1)
        {
            if (spell_difficulty(spell) != level)
                continue;
        }
        else if (!((disciplines & disc1) || (disciplines & disc2))
                 || disciplines_conflict(disc1, disciplines)
                 || disciplines_conflict(disc2, disciplines))
        {
            continue;
        }
        // Only wizards gets spells still under development.
        const unsigned int flags = get_spell_flags(spell);
        if (flags & SPFLAG_DEVEL)
        {
#ifdef WIZARD
            if (!you.wizard)
                continue;
#else
            continue;
#endif
        }
        if (avoid_uncastable && undead_cannot_memorise(spell, you.is_undead))
        {
            uncastable_discard++;
            continue;
        }
        if (god_dislikes_spell_type(spell, god))
        {
            god_discard++;
            continue;
        }
        // Passed all tests.
        spell_list.push_back(spell);
    }
}
static void _get_spell_list(std::vector<spell_type> &spell_list,
                            unsigned int disc1, unsigned int disc2,
                            god_type god, bool avoid_uncastable,
                            int &god_discard, int &uncastable_discard)
{
    _get_spell_list(spell_list, -1, disc1, disc2,
                    god, avoid_uncastable, god_discard, uncastable_discard);
}
static void _get_spell_list(std::vector<spell_type> &spell_list, int level,
                            god_type god, bool avoid_uncastable,
                            int &god_discard, int &uncastable_discard)
{
    _get_spell_list(spell_list, level, SPTYP_NONE, SPTYP_NONE,
                    god, avoid_uncastable, god_discard, uncastable_discard);
}

Deletion in crawl-ref/source/spl-book.cc at line 1826 [5.397614]
B:BD[3.9371] → [3.9371:9372]

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

B:BD[3.9478] → [3.9478:10701]

    for (int i = 0; i < NUM_SPELLS; i++)
    {
        const spell_type spell = (spell_type) i;
        if (!is_valid_spell(spell))
            continue;
        if (spell_difficulty(spell) != level)
            continue;
        const unsigned int flags   = get_spell_flags(spell);
        const unsigned int schools = get_spell_disciplines(spell);
        // Don't include schoolless spells, like Smiting.
        if (schools == 0)
            continue;
        // Holy spells don't show up in books.
        if (schools & SPTYP_HOLY)
            continue;
        if (flags & (SPFLAG_MONSTER | SPFLAG_CARD | SPFLAG_TESTING))
            continue;
        // Only wizards gets spells still under development.
        if (flags & SPFLAG_DEVEL)
        {
#ifdef WIZARD
            if (!you.wizard)
                continue;
#else
            continue;
#endif
        }
        if (avoid_uncastable && undead_cannot_memorise(spell, you.is_undead))
        {
            uncastable_discard++;
            continue;
        }
        if (god_dislikes_spell_type(spell, god))
        {
            god_discard++;
            continue;
        }
        // Passed all tests.
        spell_list.push_back(spell);
    }

[3.9478]

[3.10701]

    _get_spell_list(spell_list, level, god, avoid_uncastable,
                    god_discard, uncastable_discard);

Insertion in crawl-ref/source/spl-book.cc at line 1859 [5.397614]

[3.11616]

        // Some gods (Elyvilon) dislike a lot of the higher level spells,
        // so try a lower level.
        if (god != GOD_NO_GOD && god != GOD_XOM)
            return make_book_level_randart(book, level - 1, num_spells);

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

B:BD[3.12248] → [3.12248:12312]

    std::vector<bool> avoid_memorised(spell_list.size(), true);

[3.12248]

[3.12312]

    std::vector<bool> avoid_memorised(spell_list.size(), avoid_uncastable);

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

B:BD[3.13176] → [3.13176:13291]

    if (!props.exists( SPELL_LIST_KEY ))
        props[SPELL_LIST_KEY].new_vector(SV_LONG).resize(SPELLBOOK_SIZE);

[3.13176]

[3.13291]

    props[SPELL_LIST_KEY].new_vector(SV_LONG).resize(SPELLBOOK_SIZE);

Insertion in crawl-ref/source/spl-book.cc at line 1927 [5.397614]

[15.1933]


bool make_book_theme_randart(item_def &book, int disc1, int disc2,
                             int num_spells, int max_levels)
{
    ASSERT(book.base_type == OBJ_BOOKS);
    ASSERT(book.book_number()    != BOOK_MANUAL
           && book.book_number() != BOOK_DESTRUCTION);
    ASSERT(is_random_artefact(book));
    ASSERT(!book.props.exists(SPELL_LIST_KEY));
    god_type god;
    (void) origin_is_god_gift(book, &god);
    const bool avoid_uncastable = (god != GOD_NO_GOD && god != GOD_XOM)
                                  || origin_is_acquirement(book);
    if (num_spells == -1)
        num_spells = SPELLBOOK_SIZE;
    ASSERT(num_spells > 0 && num_spells <= SPELLBOOK_SIZE);
    if (max_levels == -1)
        max_levels = INT_MAX;
    ASSERT(max_levels > 0);
    if (disc1 == 0 && disc2 == 0)
    {
        // Eliminate disciplines that the god disapproves of or from which
        // all spells are discarded.
        std::vector<int> ok_discs;
        for (int i = 0; i < SPTYP_LAST_EXPONENT; i++)
        {
            int disc = 1 << i;
            if (god_dislikes_spell_discipline(disc, god))
                continue;
            int junk1 = 0, junk2 = 0;
            std::vector<spell_type> spell_list;
            _get_spell_list(spell_list, disc, disc, god, avoid_uncastable,
                            junk1, junk2);
            if(spell_list.empty())
                continue;
            ok_discs.push_back(i);
        }
        ASSERT( !ok_discs.empty() );
        if (ok_discs.empty())
        {
            mpr("No valid disciplines with which to make a themed ranadart "
                "spellbook.", MSGCH_ERROR);
            return (false);
        }
        do
        {
            disc1 = 1 << ok_discs[random2(ok_discs.size())];
            disc2 = 1 << ok_discs[random2(ok_discs.size())];
        } while(disciplines_conflict(disc1, disc2));
    }
    else if (disc2 == 0)
        disc2 = disc1;
    ASSERT(disc1 < (1 << (SPTYP_LAST_EXPONENT + 1)));
    ASSERT(disc2 < (1 << (SPTYP_LAST_EXPONENT + 1)));
    ASSERT(count_bits(disc1) == 1 && count_bits(disc2) == 1);
    int god_discard        = 0;
    int uncastable_discard = 0;
    std::vector<spell_type> spell_list;
    _get_spell_list(spell_list, disc1, disc2, god, avoid_uncastable,
                    god_discard, uncastable_discard);
    if (num_spells > (int) spell_list.size())
        num_spells = spell_list.size();
    std::vector<bool> spell_used(spell_list.size(), false);
    spell_type chosen_spells[SPELLBOOK_SIZE];
    for (int i = 0; i < SPELLBOOK_SIZE; i++)
    {
        chosen_spells[i] = SPELL_NO_SPELL;
    }
    int book_pos = 0;
    while (book_pos < num_spells && max_levels > 0)
    {
        int spell_pos = random2(spell_list.size());
        if (spell_used[spell_pos])
            continue;
        spell_type spell = spell_list[spell_pos];
        ASSERT(spell != SPELL_NO_SPELL);
        int spell_level = spell_difficulty(spell);
        if (spell_level > max_levels)
            continue;
        spell_used[spell_pos]     = true;
        chosen_spells[book_pos++] = spell;
        max_levels               -= spell_level;
    }
    std::sort(chosen_spells, chosen_spells + SPELLBOOK_SIZE,
              _compare_spells);
    ASSERT(chosen_spells[0] != SPELL_NO_SPELL);
    CrawlHashTable &props = book.props;
    props[SPELL_LIST_KEY].new_vector(SV_LONG).resize(SPELLBOOK_SIZE);
    CrawlVector &spell_vec = props[SPELL_LIST_KEY];
    spell_vec.set_max_size(SPELLBOOK_SIZE);
    for (int i = 0; i < SPELLBOOK_SIZE; i++)
        spell_vec[i] = (long) chosen_spells[i];
    std::string name;
    if (god != GOD_NO_GOD)
    {
        name  = '"';
        name += god_name(god, false) + "'s book";
    }
    name += " of ";
    name += spelltype_long_name(disc1);
    if (disc1 != disc2)
    {
        name += " and ";
        name += spelltype_long_name(disc2);
    }
    if (god != GOD_NO_GOD)
        name += '"';
    set_randart_name(book, name);
    return (true);
}
bool book_has_title(const item_def &book)
{
    ASSERT(book.base_type == OBJ_BOOKS);
    if (!is_artefact(book))
        return (false);
    return (get_artefact_name(book)[0] == '"');
}

Insertion in crawl-ref/source/shopping.cc at line 1613 [5.759950]

[16.3613]

        {
            int rarity = 0;
            if (is_random_artefact(item))
            {
                // Consider spellbook as rare as its rarest spell.
                // NOTE: This probably undervalues a book if it contains
                // lots of rare spells.
                for (int i = 0; i < SPELLBOOK_SIZE; i++)
                {
                    spell_type spell = which_spell_in_book(item, i);
                    if (spell == SPELL_NO_SPELL)
                        continue;
                    if (rarity > spell_rarity(spell))
                        rarity = spell_rarity(spell);
                }
            }
            else
                rarity = book_rarity(item.sub_type);

Insertion in crawl-ref/source/shopping.cc at line 1634 [5.759950]
[16.3668]
[5.796875]
```
        }
```
Replacement in crawl-ref/source/religion.h at line 58 [5.800304]
B:BD[17.417] → [18.3040:3082]
```
god_type string_to_god(const char *name);
```
[17.417]
[18.3082]
```
god_type string_to_god(const char *name, bool exact = true);
```

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

[3.15806]

// NOTE: As of now, these two functions only say if a god won't give a
// spell/school when giving a gift.

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

B:BD[3.15883] → [3.15883:15956]

bool god_dislikes_spell_school(int school, god_type god = you.religion);

[3.15883]

[3.15956]

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

Replacement in crawl-ref/source/religion.cc at line 2249 [5.804403]
B:BD[5.822744] → [18.8894:8935]
```
god_type string_to_god(const char *name)
```
[5.822744]
[18.8935]
```
god_type string_to_god(const char *_name, bool exact)
```

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

B:BD[18.8937] → [18.8937:8955]

    god_type god;

[18.8937]

[19.2597]

    std::string target(_name);
    trim_string(target);
    lowercase(target);
    if (target.empty())
        return (GOD_NO_GOD);
    int      num_partials = 0;
    god_type partial      = GOD_NO_GOD;

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

B:BD[18.9000] → [18.9000:9070]

        god = (god_type) i;
        if (name == god_name(god, false))

[18.9000]

[18.9070]

        god_type    god  = (god_type) i;
        std::string name = lowercase_string(god_name(god, false));
        if (name == target)

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

[18.9096]


        if (!exact && name.find(target) != std::string::npos)
        {
            // Return nothing for ambiguous partial names.
            num_partials++;
            if (num_partials > 1)
                return (GOD_NO_GOD);
            partial = god;
        }

Insertion in crawl-ref/source/religion.cc at line 2278 [5.804403]
[18.9103]
[18.9103]
```
    if (!exact && num_partials == 1)
        return (partial);
```

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

B:BD[3.16156] → [3.16156:16264]

    unsigned int flags   = get_spell_flags(spell);
    unsigned int schools = get_spell_disciplines(spell);

[3.16156]

[3.16264]

    unsigned int flags       = get_spell_flags(spell);
    unsigned int disciplines = get_spell_disciplines(spell);

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

B:BD[3.16297] → [3.16297:16366]

        if ((flags & SPFLAG_UNHOLY) || (schools & SPTYP_NECROMANCY))

[3.16297]

[3.16366]

        if ((flags & SPFLAG_UNHOLY) || (disciplines & SPTYP_NECROMANCY))

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

B:BD[3.16690] → [3.16690:16759]

        if ((schools & SPTYP_POISON) && spell != SPELL_CURE_POISON_I

[3.16690]

[3.16759]

        if ((disciplines & SPTYP_POISON) && spell != SPELL_CURE_POISON_I

Replacement in crawl-ref/source/religion.cc at line 3510 [5.804403]
B:BD[3.17363] → [3.17363:17397]
```
        if (schools & SPTYP_HOLY)
```
[3.17363]
[3.17397]
```
        if (disciplines & SPTYP_HOLY)
```
Replacement in crawl-ref/source/religion.cc at line 3528 [5.804403]
B:BD[3.17947] → [3.17947:17987]
```
        if (schools & SPTYP_DIVINATION)
```
[3.17947]
[3.17987]
```
        if (disciplines & SPTYP_DIVINATION)
```
Replacement in crawl-ref/source/religion.cc at line 3533 [5.804403]
B:BD[3.18107] → [3.18107:18141]
```
        if (schools & SPTYP_HOLY)
```
[3.18107]
[3.18141]
```
        if (disciplines & SPTYP_HOLY)
```

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

B:BD[3.18207] → [3.18207:18314]

        // A peaceful god of healing wouldn't like combat spells.
        if (schools & SPTYP_CONJURATION)

[3.18207]

[3.18314]

        // A peaceful god of healing wouldn't like combat spells.  All
        if (disciplines & SPTYP_CONJURATION)

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

B:BD[3.18520] → [3.18520:18577]

bool god_dislikes_spell_school(int school, god_type god)

[3.18520]

[3.18577]

bool god_dislikes_spell_discipline(int discipline, god_type god)

Insertion in crawl-ref/source/religion.cc at line 3556 [5.804403]
[3.18579]
[3.18579]
```
    ASSERT(discipline < (1 << (SPTYP_LAST_EXPONENT + 1)));
```

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

B:BD[3.18631] → [3.18631:18687]

    if (is_good_god(god) && school == SPTYP_NECROMANCY)

[3.18631]

[3.18687]

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

Replacement in crawl-ref/source/religion.cc at line 3567 [5.804403]
B:BD[3.18759] → [3.18759:18800]
```
        return (school == SPTYP_POISON);
```
[3.18759]
[3.18800]
```
        return (discipline & SPTYP_POISON);
```
Replacement in crawl-ref/source/religion.cc at line 3570 [5.804403]
B:BD[3.18827] → [3.18827:18866]
```
        return (school == SPTYP_HOLY);
```
[3.18827]
[3.18866]
```
        return (discipline & SPTYP_HOLY);
```

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

B:BD[3.18885] → [3.18885:18954]

        return (school == SPTYP_DIVINATION || school == SPTYP_HOLY);

[3.18885]

[3.18954]

        return (discipline & (SPTYP_DIVINATION | SPTYP_HOLY));

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

B:BD[3.18978] → [3.18978:19024]

        return (school == SPTYP_CONJURATION);

[3.18978]

[3.19024]

        return (discipline & (SPTYP_CONJURATION | SPTYP_SUMMONING));

Insertion in crawl-ref/source/randart.h at line 37 [5.889057]

[20.2516]

[5.890407]


/* ***********************************************************************
 * called from: spl-book
 * *********************************************************************** */
void set_randart_name( item_def &item, const std::string &name );
void set_randart_appearance( item_def &item, const std::string &appear );

Deletion in crawl-ref/source/randart.cc at line 36 [5.893152]
B:BD[3.19088] → [3.19088:19149]
∅:D[3.19149] → [20.2595:2596]
B:BD[21.2742] → [20.2595:2596]
```
#define SPELL_LIST_KEY "spell_list"
#define SPELLBOOK_SIZE 8
```
Replacement in crawl-ref/source/randart.cc at line 1124 [5.893152]
B:BD[12.5170] → [3.19498:19547]
```
    return make_book_level_randart(book, -1, 8);
```
[12.5170]
[21.2868]
```
    return make_book_theme_randart(book);
```

Insertion in crawl-ref/source/randart.cc at line 1476 [5.893152]

[20.2942]

[21.4787]

}
void set_randart_name( item_def &item, const std::string &name )
{
    ASSERT( is_random_artefact( item ));
    ASSERT( !name.empty() );
    item.props[RANDART_NAME_KEY].get_string() = name;
}
void set_randart_appearance( item_def &item, const std::string &appear )
{
    ASSERT( is_random_artefact( item ));
    ASSERT( !appear.empty() );
    item.props[RANDART_APPEAR_KEY].get_string() = appear;

Insertion in crawl-ref/source/randart.cc at line 2053 [5.893152]

[22.3165]

[22.3166]

    ASSERT(!item.props.exists( RANDART_NAME_KEY ));
    ASSERT(!item.props.exists( RANDART_APPEAR_KEY ));

Replacement in crawl-ref/source/randart.cc at line 2085 [5.893152]

B:BD[21.5392] → [21.5392:5444]

B:BD[21.5444] → [20.7858:7934]

    ASSERT(!item.props.exists( RANDART_NAME_KEY ));
    item.props[RANDART_NAME_KEY].get_string() = artefact_name(item, false);

[21.5392]

[21.5520]

    if (item.props.exists( RANDART_NAME_KEY ))
        ASSERT(item.props[RANDART_NAME_KEY].get_type() == SV_STR);
    else
        item.props[RANDART_NAME_KEY].get_string() = artefact_name(item, false);

Replacement in crawl-ref/source/randart.cc at line 2091 [5.893152]

B:BD[21.5552] → [21.5552:5606]

B:BD[21.5606] → [20.7935:8012]

    ASSERT(!item.props.exists( RANDART_APPEAR_KEY ));
    item.props[RANDART_APPEAR_KEY].get_string() = artefact_name(item, true);

[21.5552]

[21.5683]

    if (item.props.exists( RANDART_APPEAR_KEY ))
        ASSERT(item.props[RANDART_APPEAR_KEY].get_type() == SV_STR);
    else
        item.props[RANDART_APPEAR_KEY].get_string() =
            artefact_name(item, true);

Insertion in crawl-ref/source/itemname.cc at line 41 [5.2667494]
[5.2668200]
[23.2977]
```
#include "spl-book.h"
```

Insertion in crawl-ref/source/itemname.cc at line 86 [5.2667494]

[24.1088]

[25.18924]


    if (base_type == OBJ_BOOKS && (ident || item_type_known(*this))
        && book_has_title(*this))
    {
        if (descrip != DESC_DBNAME)
            descrip = DESC_PLAIN;
    }

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

B:BD[12.7465] → [12.7465:7525]

                buff << "book" << get_artefact_name(*this);

[12.7465]

[12.7525]

            {
                if (book_has_title(*this))
                    buff << get_artefact_name(*this);
                else
                    buff << "book " << get_artefact_name(*this);
            }

Replacement in crawl-ref/source/acr.cc at line 555 [5.4397395]

B:BD[3.24773] → [3.24773:24776]

[3.24773]

[3.24776]


        mpr("Fake item as gift from which god (ENTER to leave alone): ",
            MSGCH_PROMPT);
        char name[80]; 
        if (!cancelable_get_line( name, sizeof( name ) ) && name[0])
        {
            god_type god = string_to_god(name, false);
            if (god == GOD_NO_GOD)
               mpr("No such god, leaving item origin alone.");
            else
            { 
               mprf("God gift of %s.", god_name(god, false).c_str());
               item.orig_monnum = -god;
            }
        }

Insertion in crawl-ref/source/acr.cc at line 3830 [5.4397395]
[23.53225]
[23.53225]
```
    init_spell_rarities();
```

Non-weighted themed randart spellbooks, and prices for randart spellbooks.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/spl-util.h at line 97 [5.242902]

Insertion in crawl-ref/source/spl-util.cc at line 392 [5.245665]

Insertion in crawl-ref/source/spl-util.cc at line 399 [5.245665]

Replacement in crawl-ref/source/spl-data.h at line 569 [5.268152]

Replacement in crawl-ref/source/spl-data.h at line 724 [5.268152]

Replacement in crawl-ref/source/spl-data.h at line 749 [5.268152]

Replacement in crawl-ref/source/spl-data.h at line 871 [5.268152]

Replacement in crawl-ref/source/spl-data.h at line 883 [5.268152]

Replacement in crawl-ref/source/spl-data.h at line 1002 [5.268152]

Replacement in crawl-ref/source/spl-data.h at line 1062 [5.268152]

Replacement in crawl-ref/source/spl-data.h at line 1098 [5.268152]

Replacement in crawl-ref/source/spl-data.h at line 1122 [5.268152]

Replacement in crawl-ref/source/spl-data.h at line 1387 [5.268152]

Replacement in crawl-ref/source/spl-data.h at line 1399 [5.268152]

Replacement in crawl-ref/source/spl-data.h at line 1411 [5.268152]

Replacement in crawl-ref/source/spl-data.h at line 2012 [5.268152]

Replacement in crawl-ref/source/spl-data.h at line 2408 [5.268152]

Insertion in crawl-ref/source/spl-book.h at line 15 [5.395672]

Replacement in crawl-ref/source/spl-book.h at line 31 [5.395672]

Deletion in crawl-ref/source/spl-book.h at line 35 [5.395672]

Replacement in crawl-ref/source/spl-book.h at line 74 [5.395672]

Insertion in crawl-ref/source/spl-book.h at line 76 [5.395672]

Deletion in crawl-ref/source/spl-book.cc at line 50 [5.397614]

Insertion in crawl-ref/source/spl-book.cc at line 962 [5.397614]

Insertion in crawl-ref/source/spl-book.cc at line 1001 [5.397614]

Insertion in crawl-ref/source/spl-book.cc at line 1702 [5.397614]

Deletion in crawl-ref/source/spl-book.cc at line 1826 [5.397614]

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

Insertion in crawl-ref/source/spl-book.cc at line 1859 [5.397614]

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

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

Insertion in crawl-ref/source/spl-book.cc at line 1927 [5.397614]

Insertion in crawl-ref/source/shopping.cc at line 1613 [5.759950]

Insertion in crawl-ref/source/shopping.cc at line 1634 [5.759950]

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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