fiddlerwoaroof/crawl - Change 6F6OFJCUOBUP7QTVWSMSQPW25RLVRYVXO3VO5GLMFRY6K5RMOWFAC

Weighted themed randart spellbooks.

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

Created by zelgadis on December 5, 2008

6F6OFJCUOBUP7QTVWSMSQPW25RLVRYVXO3VO5GLMFRY6K5RMOWFAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spl-book.cc at line 36 [3.397614]
[3.398397]
[3.398397]
```
#include "skills2.h"
```

Replacement in crawl-ref/source/spl-book.cc at line 1792 [3.397614]

B:BD[4.8064] → [4.8064:8202]

    const bool avoid_uncastable = (god != GOD_NO_GOD && god != GOD_XOM)
                                  || origin_is_acquirement(book);

[4.8064]

[4.8202]

    const bool completely_random =
        god == GOD_XOM || (god == GOD_NO_GOD && !origin_is_acquirement(book));

Replacement in crawl-ref/source/spl-book.cc at line 1800 [3.397614]

B:BD[4.8374] → [4.8374:8479]

            avoid_uncastable ? std::min(9, you.get_experience_level())
                             : 9;

[4.8374]

[4.8479]

            completely_random ? 9 : std::min(9, you.get_experience_level());

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

B:BD[4.9478] → [2.5220:5282]

    _get_spell_list(spell_list, level, god, avoid_uncastable,

[4.9478]

[2.5282]

    _get_spell_list(spell_list, level, god, !completely_random,

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

B:BD[4.12248] → [2.5568:5644]

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

[4.12248]

[4.12312]

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

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

[5.1933]

[2.5716]


static bool _get_weighted_discs(bool completely_random, god_type god,
                                int &disc1, int &disc2)
{
    // Eliminate disciplines that the god disapproves of or from which
    // all spells are discarded.
    std::vector<int> ok_discs;
    std::vector<int> skills;
    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, !completely_random,
                        junk1, junk2);
        if(spell_list.empty())
            continue;
        ok_discs.push_back(disc);
        skills.push_back(spell_type2skill(disc));
    }
    int num_discs = ok_discs.size();
    ASSERT( num_discs > 0 );
    if (num_discs == 0)
    {
        mpr("No valid disciplines with which to make a themed ranadart "
            "spellbook.", MSGCH_ERROR);
        return (false);
    }
    int skill_weights[SPTYP_LAST_EXPONENT];
    int apt_weights[SPTYP_LAST_EXPONENT];
    memset(skill_weights, 0, SPTYP_LAST_EXPONENT * sizeof(int));
    memset(apt_weights,   0, SPTYP_LAST_EXPONENT * sizeof(int));

Insertion in crawl-ref/source/spl-book.cc at line 1969 [3.397614]

[2.5717]

    if (completely_random)
    {
        for (int i = 0; i < num_discs; i++)
        {
            skill_weights[i] = 1;
            apt_weights[i]   = 1;
        }
    }
    else
    {
        int total_skills = 0;
        for (int i = 0; i < num_discs; i++)
        {
            int skill = skills[i];
            skill_weights[i] = you.skills[skill];
            int apt = species_skills(skill, you.species);
            apt_weights[i] = (int) ( (1.0 / (double) apt) * 1000000.0);
            total_skills += skill_weights[i];
        }
        if (total_skills == 0)
        {
            for (int i = 0; i < num_discs; i++)
                skill_weights[i] = apt_weights[i];
        }
    }
    do {
        disc1 = ok_discs[choose_random_weighted(skill_weights,
                                                skill_weights + num_discs)];
        disc2 = ok_discs[choose_random_weighted(apt_weights,
                                                apt_weights + num_discs)];
    } while(disciplines_conflict(disc1, disc2));
    return (true);
}
static void _get_weighted_spells(bool completely_random, god_type god,
                                 int disc1, int disc2,
                                 int num_spells, int max_levels,
                                 const std::vector<spell_type> &spell_list,
                                 spell_type chosen_spells[])
{
    ASSERT(num_spells <= (int) spell_list.size());
    ASSERT(num_spells <= SPELLBOOK_SIZE && num_spells > 0);
    ASSERT(max_levels > 0);
    int spell_weights[NUM_SPELLS];
    memset(spell_weights, 0, NUM_SPELLS * sizeof(int));
    if (completely_random)
    {
        for (unsigned int i = 0; i < spell_list.size(); i++)
        {
            spell_type spl = spell_list[i];
            if (god == GOD_XOM)
                spell_weights[spl] = count_bits(get_spell_disciplines(spl));
            else
                spell_weights[spl] = 1;
        }
    }
    else
    {
        const int Spc = you.skills[SK_SPELLCASTING];
        for (unsigned int i = 0; i < spell_list.size(); i++)
        {
            spell_type spell = spell_list[i];
            unsigned int disciplines = get_spell_disciplines(spell);
            int d = 1;
            if ((disciplines & disc1) && (disciplines & disc2))
                d = 2;
            int c = 1;
            if (!you.seen_spell[spell])
                c = 4;
            else if (!_is_memorized(spell))
                c = 2;
            int total_skill = 0;
            int num_skills  = 0;
            for (int j = 0; j < SPTYP_LAST_EXPONENT; j++)
            {
                int disc = 1 << j;
                if (disciplines & disc)
                {
                    total_skill += you.skills[spell_type2skill(disc)];
                    num_skills++;
                }
            }
            int w = 1;
            if (num_skills > 0)
                w = (2 + (total_skill / num_skills)) / 3;
            w = std::max(1, w);
            int l = 5 - abs(3 * spell_difficulty(spell) - Spc) / 7;
            int weight = d * c * w * l;
            ASSERT(weight > 0);
            spell_weights[spell] = weight;
        }
    }
    int book_pos    = 0;
    int spells_left = spell_list.size();
    while(book_pos < num_spells && max_levels > 0 && spells_left > 0)
    {
        spell_type spell =
            (spell_type) choose_random_weighted(spell_weights,
                                                spell_weights + NUM_SPELLS);
        ASSERT(is_valid_spell(spell));
        ASSERT(spell_weights[spell] > 0);
        int levels = spell_difficulty(spell);
        if (levels > max_levels)
        {
            spell_weights[spell] = 0;
            spells_left--;
            continue;
        }
        chosen_spells[book_pos++] = spell;
        spell_weights[spell]      = 0;
        max_levels               -= levels;
        spells_left--;
    }
    ASSERT(book_pos > 0 && max_levels >= 0);
}

Replacement in crawl-ref/source/spl-book.cc at line 2114 [3.397614]

B:BD[2.6140] → [2.6140:6278]

    const bool avoid_uncastable = (god != GOD_NO_GOD && god != GOD_XOM)
                                  || origin_is_acquirement(book);

[2.6140]

[2.6278]

    const bool completely_random =
        god == GOD_XOM || (god == GOD_NO_GOD && !origin_is_acquirement(book));

Replacement in crawl-ref/source/spl-book.cc at line 2127 [3.397614]

B:BD[2.6528] → [2.6528:7366]

        // 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);

[2.6528]

[2.7366]

        if (!_get_weighted_discs(completely_random, god, disc1, disc2))

Deletion in crawl-ref/source/spl-book.cc at line 2129 [3.397614]

B:BD[2.7394] → [2.7394:7601]

        }
        do
        {
            disc1 = 1 << ok_discs[random2(ok_discs.size())];
            disc2 = 1 << ok_discs[random2(ok_discs.size())];
        } while(disciplines_conflict(disc1, disc2));

Replacement in crawl-ref/source/spl-book.cc at line 2141 [3.397614]

B:BD[2.7932] → [2.7932:8001]

    _get_spell_list(spell_list, disc1, disc2, god, avoid_uncastable,

[2.7932]

[2.8001]

    _get_spell_list(spell_list, disc1, disc2, god, !completely_random,

Deletion in crawl-ref/source/spl-book.cc at line 2146 [3.397614]
B:BD[2.8142] → [2.8142:8203]
```
    std::vector<bool> spell_used(spell_list.size(), false);
```
Deletion in crawl-ref/source/spl-book.cc at line 2149 [3.397614]
B:BD[2.8295] → [2.8295:8301]
```
    {
```

Deletion in crawl-ref/source/spl-book.cc at line 2150 [3.397614]

B:BD[2.8344] → [2.8344:8483]

    }
    int book_pos = 0;
    while (book_pos < num_spells && max_levels > 0)
    {
        int spell_pos = random2(spell_list.size());

Replacement in crawl-ref/source/spl-book.cc at line 2151 [3.397614]

B:BD[2.8484] → [2.8484:8541]

        if (spell_used[spell_pos])
            continue;

[2.8484]

[2.8541]

    _get_weighted_spells(completely_random, god, disc1, disc2,
                         num_spells, max_levels, spell_list, chosen_spells);

Deletion in crawl-ref/source/spl-book.cc at line 2154 [3.397614]

B:BD[2.8542] → [2.8542:8886]

        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;
    }

Replacement in crawl-ref/source/spl-book.cc at line 2172 [3.397614]

B:BD[2.9407] → [2.9407:9457]

        name += god_name(god, false) + "'s book";

[2.9407]

[2.9457]

        name += god_name(god, false) + "'s book ";

Replacement in crawl-ref/source/spl-book.cc at line 2175 [3.397614]
B:BD[2.9464] → [2.9464:9484]
```
    name += " of ";
```
[2.9464]
[2.9484]
```
    name += "of ";
```