fiddlerwoaroof/crawl - Change 46MRRHVYJ3BS74R2BEVUWEWJCI4FCRBSLZ3NWMQCE6FUCNE5P73QC

The start of randart spellbooks. Never randomly generated and only created via

the wizard command &+, since there's no logic to how the random set of spells are selected and there's no valuation code in shopping.cc. No randart manuals or books of destruction, since I have no clue what they'd be like.

The code allows for any book or spell to have its normal set of spells overridden by an arbitrary/customized set of spells, but this is only used by randart spellbooks as of now.

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

Created by zelgadis on December 2, 2008

46MRRHVYJ3BS74R2BEVUWEWJCI4FCRBSLZ3NWMQCE6FUCNE5P73QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-data.h at line 2432 [6.268152]

B:BD[5.8810] → [5.8810:8853]

     SPFLAG_DIR_OR_TARGET | SPFLAG_UNHOLY,

[5.8810]

[5.8853]

     SPFLAG_DIR_OR_TARGET | SPFLAG_UNHOLY | SPFLAG_MONSTER,

Replacement in crawl-ref/source/spl-data.h at line 2444 [6.268152]
B:BD[7.4471] → [7.4471:4491]
```
     SPFLAG_UNHOLY,
```
[7.4471]
[7.4491]
```
     SPFLAG_UNHOLY | SPFLAG_MONSTER,
```
Replacement in crawl-ref/source/spl-data.h at line 2456 [6.268152]
B:BD[7.4565] → [8.4329:4365]
```
     SPFLAG_UNHOLY | SPFLAG_TARGET,
```
[7.4565]
[7.4585]
```
     SPFLAG_UNHOLY | SPFLAG_TARGET | SPFLAG_MONSTER,
```
Replacement in crawl-ref/source/spl-data.h at line 2468 [6.268152]
B:BD[7.4677] → [7.4677:4697]
```
     SPFLAG_UNHOLY,
```
[7.4677]
[7.4697]
```
     SPFLAG_UNHOLY | SPFLAG_MONSTER,
```
Replacement in crawl-ref/source/spl-data.h at line 2480 [6.268152]
B:BD[7.4773] → [7.4773:4800]
```
     SPFLAG_DIR_OR_TARGET,
```
[7.4773]
[7.4800]
```
     SPFLAG_DIR_OR_TARGET | SPFLAG_MONSTER,
```
Replacement in crawl-ref/source/spl-data.h at line 2492 [6.268152]
B:BD[7.4860] → [7.4860:4880]
```
     SPFLAG_UNHOLY,
```
[7.4860]
[7.4880]
```
     SPFLAG_UNHOLY | SPFLAG_MONSTER,
```
Replacement in crawl-ref/source/spl-data.h at line 2504 [6.268152]
B:BD[7.4953] → [7.4953:4973]
```
     SPFLAG_UNHOLY,
```
[7.4953]
[7.4973]
```
     SPFLAG_UNHOLY | SPFLAG_MONSTER,
```
Replacement in crawl-ref/source/spl-data.h at line 2516 [6.268152]
B:BD[7.5036] → [7.5036:5063]
```
     SPFLAG_DIR_OR_TARGET,
```
[7.5036]
[7.5063]
```
     SPFLAG_DIR_OR_TARGET | SPFLAG_MONSTER,
```
Replacement in crawl-ref/source/spl-data.h at line 2528 [6.268152]
B:BD[7.5120] → [7.5120:5147]
```
     SPFLAG_DIR_OR_TARGET,
```
[7.5120]
[7.5147]
```
     SPFLAG_DIR_OR_TARGET | SPFLAG_MONSTER,
```
Replacement in crawl-ref/source/spl-data.h at line 2540 [6.268152]
B:BD[7.5226] → [7.5226:5244]
```
     SPFLAG_NONE,
```
[7.5226]
[7.5244]
```
     SPFLAG_MONSTER,
```
Replacement in crawl-ref/source/spl-data.h at line 2552 [6.268152]
B:BD[7.5313] → [7.5313:5331]
```
     SPFLAG_NONE,
```
[7.5313]
[7.5331]
```
     SPFLAG_MONSTER,
```
Replacement in crawl-ref/source/spl-data.h at line 2564 [6.268152]
B:BD[7.5406] → [7.5406:5433]
```
     SPFLAG_DIR_OR_TARGET,
```
[7.5406]
[7.5433]
```
     SPFLAG_DIR_OR_TARGET | SPFLAG_MONSTER,
```
Replacement in crawl-ref/source/spl-data.h at line 2576 [6.268152]
B:BD[7.5495] → [7.5495:5522]
```
     SPFLAG_DIR_OR_TARGET,
```
[7.5495]
[7.5522]
```
     SPFLAG_DIR_OR_TARGET | SPFLAG_MONSTER,
```
Replacement in crawl-ref/source/spl-data.h at line 2588 [6.268152]
B:BD[7.5603] → [7.5603:5630]
```
     SPFLAG_DIR_OR_TARGET,
```
[7.5603]
[7.5630]
```
     SPFLAG_DIR_OR_TARGET | SPFLAG_MONSTER,
```
Replacement in crawl-ref/source/spl-data.h at line 2600 [6.268152]
B:BD[7.5690] → [7.5690:5708]
```
     SPFLAG_NONE,
```
[7.5690]
[7.5708]
```
     SPFLAG_MONSTER,
```

Replacement in crawl-ref/source/spl-data.h at line 2612 [6.268152]

B:BD[7.5785] → [8.4530:4573]

     SPFLAG_ESCAPE | SPFLAG_DIR_OR_TARGET,

[7.5785]

[7.5803]

     SPFLAG_ESCAPE | SPFLAG_DIR_OR_TARGET | SPFLAG_MONSTER,

Replacement in crawl-ref/source/spl-data.h at line 2624 [6.268152]
B:BD[7.5863] → [7.5863:5881]
```
     SPFLAG_NONE,
```
[7.5863]
[7.5881]
```
     SPFLAG_MONSTER,
```

Replacement in crawl-ref/source/spl-cast.h at line 30 [6.291319]

B:BD[8.4830] → [8.4830:4893]

    SPFLAG_AREA                 = 0x0800        // area affect

[8.4830]

[9.46413]

    SPFLAG_AREA                 = 0x0800,       // area affect
    SPFLAG_MONSTER              = 0x1000        // monster-only spell

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

B:BD[10.1725] → [10.1725:1789]

        if (you.wizard && !allow_fail && is_valid_spell(spell))

[10.1725]

[10.1789]

        if (you.wizard && !allow_fail && is_valid_spell(spell)
            && (flags & SPFLAG_MONSTER))

Insertion in crawl-ref/source/spl-cast.cc at line 2101 [6.293070]
[10.2119]
[6.341590]
```
        return (SPRET_ABORT);
```
Insertion in crawl-ref/source/spl-book.h at line 16 [6.395672]
[6.395945]
[11.280]
```
#define SPELLBOOK_SIZE 8
#define SPELL_LIST_KEY "spell_list"
```
Insertion in crawl-ref/source/spl-book.h at line 35 [6.395672]
[6.396382]
[12.865]
```
bool is_valid_spell_in_book( const item_def &book, int spell );
```
Insertion in crawl-ref/source/spl-book.h at line 56 [6.395672]
[6.397183]
[5.11608]
```
spell_type which_spell_in_book(const item_def &book, int spl);
```
Insertion in crawl-ref/source/spl-book.cc at line 33 [6.397614]
[6.398375]
[6.398375]
```
#include "randart.h"
```

Insertion in crawl-ref/source/spl-book.cc at line 689 [6.397614]

[6.414071]


spell_type which_spell_in_book(const item_def &book, int spl)
{
    ASSERT(book.base_type == OBJ_BOOKS || book.base_type == OBJ_STAVES);
    const CrawlHashTable &props = book.props;
    if (!props.exists( SPELL_LIST_KEY ))
        return which_spell_in_book(book.book_number(), spl);
    const CrawlVector &spells = props[SPELL_LIST_KEY].get_vector();

Insertion in crawl-ref/source/spl-book.cc at line 700 [6.397614]

[6.414072]

[13.1693]

    ASSERT( spells.get_type() == SV_LONG );
    ASSERT( spells.size() == SPELLBOOK_SIZE );
    return static_cast<spell_type>(spells[spl].get_long());
}

Deletion in crawl-ref/source/spl-book.cc at line 723 [6.397614]
B:BD[6.415140] → [14.147:188]
```
    const int type = book.book_number();
```

Replacement in crawl-ref/source/spl-book.cc at line 746 [6.397614]

B:BD[6.416015] → [13.1847:1904]

        spell_type stype = which_spell_in_book(type, j);

[6.416015]

[13.1904]

        spell_type stype = which_spell_in_book(book, j);

Insertion in crawl-ref/source/spl-book.cc at line 955 [6.397614]

[6.420675]

[12.1025]

bool is_valid_spell_in_book( const item_def &book, int spell )
{
    return which_spell_in_book(book, spell) != SPELL_NO_SPELL;
}

Insertion in crawl-ref/source/spl-book.cc at line 1011 [6.397614]
[6.422431]
[6.422431]
```
        return (true);
    if (book.props.exists( SPELL_LIST_KEY ))
```

Replacement in crawl-ref/source/spl-book.cc at line 1068 [6.397614]

B:BD[6.423496] → [6.423496:423533]

    if (book.base_type == OBJ_BOOKS)

[6.423496]

[15.944]

    if (book.base_type == OBJ_BOOKS && !book.props.exists( SPELL_LIST_KEY ))

Replacement in crawl-ref/source/spl-book.cc at line 1177 [6.397614]

B:BD[16.11247] → [17.7631:7708]

        const spell_type stype = which_spell_in_book(book.book_number(), j);

[16.11247]

[16.11325]

        const spell_type stype = which_spell_in_book(book, j);

Replacement in crawl-ref/source/spl-book.cc at line 1252 [6.397614]

B:BD[17.8287] → [17.8287:8356]

        || !is_valid_spell_in_book( you.inv[book].sub_type, index ))

[17.8287]

[18.138210]

        || !is_valid_spell_in_book( you.inv[book], index ))

Replacement in crawl-ref/source/spl-book.cc at line 1258 [6.397614]

B:BD[6.427064] → [5.13502:13580]

    spell_type specspell = which_spell_in_book(you.inv[book].sub_type,index);

[6.427064]

[6.427144]

    spell_type specspell = which_spell_in_book(you.inv[book], index);

Replacement in crawl-ref/source/spl-book.cc at line 1400 [6.397614]

B:BD[2.158] → [2.158:232]

    while (nspel < SPELLBOOK_SIZE && is_valid_spell_in_book(type, nspel))

[2.158]

[2.232]

    while (nspel < SPELLBOOK_SIZE && is_valid_spell_in_book(item, nspel))

Replacement in crawl-ref/source/spl-book.cc at line 1495 [6.397614]

B:BD[6.433453] → [19.646:737]

∅:D[19.737] → [6.433523:433524]

B:BD[6.433523] → [6.433523:433524]

B:BD[6.433524] → [19.738:809]

    // converting sub_type into book index type
    const int type = istaff.book_number();
    if ((idx >= SPELLBOOK_SIZE) || !is_valid_spell_in_book(type, idx))

[6.433453]

[19.809]

    if ((idx >= SPELLBOOK_SIZE) || !is_valid_spell_in_book(istaff, idx))

Replacement in crawl-ref/source/spl-book.cc at line 1501 [6.397614]

B:BD[6.433578] → [19.870:933]

    const spell_type spell = which_spell_in_book( type, idx );

[6.433578]

[19.933]

    const spell_type spell = which_spell_in_book( istaff, idx );

Insertion in crawl-ref/source/randart.cc at line 27 [6.893152]
[20.3104]
[6.893644]
```
#include "spl-book.h"
#include "spl-cast.h"
#include "spl-util.h"
```

Insertion in crawl-ref/source/randart.cc at line 367 [6.893152]

[21.621]

    // Randart books have no randart properties.
    if (item.base_type == OBJ_BOOKS)
        return;

Insertion in crawl-ref/source/randart.cc at line 1097 [6.893152]

[22.2727]

[23.4178]

    }
}
static bool _compare_spell_dificulties(spell_type a, spell_type b)
{
    return (spell_difficulty(a) < spell_difficulty(b));
}
static void _init_randart_book(item_def &book)
{
    spell_type spells[SPELLBOOK_SIZE];
    int        spell_count = 0;
    while(spell_count < SPELLBOOK_SIZE)
    {
        spell_type spl = static_cast<spell_type>(random2(NUM_SPELLS));
        if (!is_valid_spell(spl))
            continue;
        // Skip monster only spells.
        if (get_spell_flags(spl) & SPFLAG_MONSTER)
            continue;
        // Holy spells don't show up in books.
        if (spell_typematch(spl, SPTYP_HOLY))
            continue;
        // Don't include schoolless spells, like Smiting.
        if (get_spell_disciplines(spl) == 0)
            continue;
        // This spell passes all of the other checks.
        if (spl == SPELL_DEBUGGING_RAY)
            continue;
        // No duplicate spells.
        bool present = false;
        for (int i = 0; i < spell_count; i++)
            if (spells[i] == spl)
            {
                present = true;
                break;
            }
        if (present)
            continue;
        spells[spell_count++] = spl;

Insertion in crawl-ref/source/randart.cc at line 1146 [6.893152]

[23.4184]

[24.2868]


    std::sort(spells, spells + SPELLBOOK_SIZE, _compare_spell_dificulties);
    CrawlHashTable &props = book.props;
    if (!props.exists( SPELL_LIST_KEY ))
        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) spells[i];

Insertion in crawl-ref/source/randart.cc at line 1183 [6.893152]

[24.3523]

    if (item.base_type == OBJ_BOOKS)
    {
        _init_randart_book(item);
        return;
    }

Insertion in crawl-ref/source/randart.cc at line 1336 [6.893152]
[6.923207]
[25.2652]
```
    case OBJ_BOOKS:
        return "book";
```

Replacement in crawl-ref/source/randart.cc at line 1376 [6.893152]

B:BD[20.8755] → [20.8755:8803]

           || item.base_type == OBJ_JEWELLERY);

[20.8755]

[4.2724]

           || item.base_type == OBJ_JEWELLERY
           || item.base_type == OBJ_BOOKS);

Insertion in crawl-ref/source/randart.cc at line 1987 [6.893152]
[26.4889]
[26.4967]
```
    if (item.base_type == OBJ_BOOKS)
        return (false);
```

Replacement in crawl-ref/source/randart.cc at line 2052 [6.893152]

B:BD[6.937079] → [6.937079:937123]

        && item.base_type != OBJ_JEWELLERY)

[6.937079]

[6.937123]

        && item.base_type != OBJ_JEWELLERY
        && item.base_type != OBJ_BOOKS)

Insertion in crawl-ref/source/randart.cc at line 2058 [6.893152]

[6.937160]

[23.6580]

    if (item.base_type == OBJ_BOOKS)
    {
       if (item.sub_type == BOOK_MANUAL || item.sub_type == BOOK_DESTRUCTION)
           return (false);
    }

Insertion in crawl-ref/source/itemname.cc at line 1469 [6.2667494]

[6.2733134]

[27.6082]

        if (is_random_artefact( *this ) && !dbname && !basename)
        {
            if (know_type)
                buff << "book" << get_artefact_name(*this);
            else
                buff << get_artefact_name(*this) << "book";
            break;
        }

Replacement in crawl-ref/source/itemname.cc at line 1571 [6.2667494]

B:BD[28.360285] → [27.6598:6651]

    if (!terse && !basename && !dbname && know_type)

[28.360285]

[28.360339]

    if (!terse && !basename && !dbname && know_type &&
        !is_random_artefact( *this ))

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

B:BD[6.2857883] → [29.802:870]

        const spell_type spell = which_spell_in_book(book.sub_type,

[6.2857883]

[29.870]

        const spell_type spell = which_spell_in_book(book,

Insertion in crawl-ref/source/describe.cc at line 427 [6.3736416]
[30.6254]
[30.6254]
```
    if (item.base_type == OBJ_BOOKS)
        return("");
```

Insertion in crawl-ref/source/dat/database/randname.txt at line 803 [20.14728]

[31.2738]

######################################################
# Books (NOTE: just a placeholder for now)
######################################################
book
@armour@
%%%%
book appearance
@armour appearance@
%%%%

Deletion in crawl-ref/source/command.cc at line 1206 [6.4082507]
B:BD[3.4954] → [3.4954:4996]
```
    const int type = item.book_number();
```

Replacement in crawl-ref/source/command.cc at line 1209 [6.4082507]

B:BD[3.5035] → [3.5035:5092]

        spell_type stype = which_spell_in_book(type, j);

[3.5035]

[3.5092]

        spell_type stype = which_spell_in_book(item, j);

Replacement in crawl-ref/source/acr.cc at line 432 [6.4397395]

B:BD[32.26307] → [32.26307:26388]

    return (type == OBJ_WEAPONS || type == OBJ_ARMOUR || type == OBJ_JEWELLERY);

[32.26307]

[32.26388]

    return (type == OBJ_WEAPONS || type == OBJ_ARMOUR || type == OBJ_JEWELLERY
            || type == OBJ_BOOKS);

Replacement in crawl-ref/source/acr.cc at line 538 [6.4397395]

B:BD[6.4410411] → [6.4410411:4410452]

        make_item_randart( you.inv[i] );

[6.4410411]

[30.7836]

        if (!make_item_randart( you.inv[i] ))
        {
            mpr("Failed to turn item into randart.");
            break;
        }

The start of randart spellbooks. Never randomly generated and only created via

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spl-data.h at line 2432 [6.268152]

Replacement in crawl-ref/source/spl-data.h at line 2444 [6.268152]

Replacement in crawl-ref/source/spl-data.h at line 2456 [6.268152]

Replacement in crawl-ref/source/spl-data.h at line 2468 [6.268152]

Replacement in crawl-ref/source/spl-data.h at line 2480 [6.268152]

Replacement in crawl-ref/source/spl-data.h at line 2492 [6.268152]

Replacement in crawl-ref/source/spl-data.h at line 2504 [6.268152]

Replacement in crawl-ref/source/spl-data.h at line 2516 [6.268152]

Replacement in crawl-ref/source/spl-data.h at line 2528 [6.268152]

Replacement in crawl-ref/source/spl-data.h at line 2540 [6.268152]

Replacement in crawl-ref/source/spl-data.h at line 2552 [6.268152]

Replacement in crawl-ref/source/spl-data.h at line 2564 [6.268152]

Replacement in crawl-ref/source/spl-data.h at line 2576 [6.268152]

Replacement in crawl-ref/source/spl-data.h at line 2588 [6.268152]

Replacement in crawl-ref/source/spl-data.h at line 2600 [6.268152]

Replacement in crawl-ref/source/spl-data.h at line 2612 [6.268152]

Replacement in crawl-ref/source/spl-data.h at line 2624 [6.268152]

Replacement in crawl-ref/source/spl-cast.h at line 30 [6.291319]

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

Insertion in crawl-ref/source/spl-cast.cc at line 2101 [6.293070]

Insertion in crawl-ref/source/spl-book.h at line 16 [6.395672]

Insertion in crawl-ref/source/spl-book.h at line 35 [6.395672]

Insertion in crawl-ref/source/spl-book.h at line 56 [6.395672]

Insertion in crawl-ref/source/spl-book.cc at line 33 [6.397614]