fiddlerwoaroof/crawl - Change UC6V7JDZ6CKQNL5AARWFJ4ZPX4ZYCO5J3FW52I52I3PBJO6T6VEAC

Also add variety to fixed level randarts, distinguishing between "easy"

(1-3), "moderate" (4-6) and "difficult" (7-9).

Recount how often each spell school is used and use the two most prominent schools (biasing by their order of definition in spl-util.h if two are tied). This doesn't completely work yet: I got a book of Enchantment and Divination although not a single spell in the book belonged to Divination (5 of them were Enchantment, so that was okay). Also, the way spells are currently selected (from two random disciplines) you can get a spell that does not fit either leading school (as later derived by counting) and might look odd with the title, e.g. a book is built on the premise of Conj/Fire and ends up as Conj/Air with Fire/Trm thrown in.

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

Created by j-p-e-g on December 16, 2008

UC6V7JDZ6CKQNL5AARWFJ4ZPX4ZYCO5J3FW52I52I3PBJO6T6VEAC

Dependencies

In channels

main

Change contents

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

B:BD[4.3247] → [4.3247:3321]

        // Only use spells available in books you might find laying about

[4.3247]

[4.3321]

        // Only use spells available in books you might find lying about

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

B:BD[4.3832] → [4.3832:3893]

        // Only wizards gets spells still under development.

[4.3832]

[4.3893]

        // Only wizard mode gets spells still under development.

Insertion in crawl-ref/source/spl-book.cc at line 1863 [5.397614]
[6.10815]
[6.10815]
```
        {
```
Insertion in crawl-ref/source/spl-book.cc at line 1866 [5.397614]
[6.10926]
[6.10926]
```
        }
```
Insertion in crawl-ref/source/spl-book.cc at line 1870 [5.397614]
[6.11121]
[6.11121]
```
        {
```
Insertion in crawl-ref/source/spl-book.cc at line 1874 [5.397614]
[6.11300]
[6.11300]
```
        }
```
Deletion in crawl-ref/source/spl-book.cc at line 1912 [5.397614]
B:BD[6.12404] → [6.12404:12410]
```
    {
```
Deletion in crawl-ref/source/spl-book.cc at line 1913 [5.397614]
B:BD[6.12453] → [6.12453:12459]
```
    }
```

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

B:BD[6.13569] → [2.374:419]

    name += getRandNameString("level book");

[6.13569]

[2.419]

    std::string difficulty;
    if (level <= 3)
        difficulty = "easy";
    else if (level <= 6)
        difficulty = "moderate";
    else
        difficulty = "difficult";
    std::string bookname = getRandNameString(difficulty + " level book");
    bookname = uppercase_first(bookname);
    if (bookname.empty())
        bookname = getRandNameString("book");
    name += bookname;

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

B:BD[4.8886] → [4.8886:8979]

    std::sort(chosen_spells, chosen_spells + SPELLBOOK_SIZE,
              _compare_spells);

[4.8542]

[4.8979]

    std::sort(chosen_spells, chosen_spells + SPELLBOOK_SIZE, _compare_spells);

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

[4.9236]

    int count[SPTYP_LAST_EXPONENT+1];
    for (int k = 0; k <= SPTYP_LAST_EXPONENT; k++)
        count[k] = 0;

Insertion in crawl-ref/source/spl-book.cc at line 2250 [5.397614]
[4.9281]
[4.9281]
```
    {
```

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

[4.9329]

        for (int k = 0; k <= SPTYP_LAST_EXPONENT; k++)
            if (spell_typematch( chosen_spells[i], 1 << k ))
                count[k]++;
    }

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

[4.9330]

    int max1 = 0;
    int max2 = 0;
    for (int k = 1; k <= SPTYP_LAST_EXPONENT; k++)
    {
        if (count[k] > count[max1])
        {
            max2 = max1;
            max1 = k;
        }
        else if (max2 == max1 || count[k] > count[max2])
            max2 = k;
    }
    disc1 = 1 << max1;
    if (max1 != max2 && count[max2] > 0 && count[max2] >= count[max1]/3)
        disc2 = 1 << max2;
    else
        disc2 = disc1;

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

[7.8096]

[8.16252]

# Book name should be set in make_book_level_randart() or
# make_book_theme_randart(), so if this gets picked there's a bug.
book
Book of Bugginess
%%%%
book appearance
@book_adjective@
%%%%

Insertion in crawl-ref/source/dat/database/randname.txt at line 846 [9.14728]
[10.5557]
[8.16411]
```
%%%%
the_book_magic
w:1
// capitalize later as needed
the Arcane Arts
w:9
@book_magic@
```
Deletion in crawl-ref/source/dat/database/randname.txt at line 861 [9.14728]
B:BD[10.5566] → [10.5566:5567]
B:BD[10.5567] → [2.3135:3151]
```
The Arcane Arts
```
Deletion in crawl-ref/source/dat/database/randname.txt at line 875 [9.14728]
B:BD[10.5651] → [10.5651:5652]
∅:D[10.5652] → [8.16454:16467]
B:BD[8.16454] → [8.16454:16467]
```
Bewitchment
```
Replacement in crawl-ref/source/dat/database/randname.txt at line 876 [9.14728]
B:BD[8.16480] → [8.16480:16491]
```
level book
```
[8.16480]
[8.16491]
```
# level 1-3
easy level book
```
Replacement in crawl-ref/source/dat/database/randname.txt at line 879 [9.14728]
B:BD[8.16492] → [2.3152:3169]
```
@book_magic@ 101
```
[8.16492]
[8.16511]
```
@the_book_magic@ 101
```
Replacement in crawl-ref/source/dat/database/randname.txt at line 883 [9.14728]
B:BD[8.16533] → [2.3189:3218]
```
@book_magic@ in Simple Steps
```
[8.16533]
[8.16564]
```
@the_book_magic@ in Simple Steps
```
Replacement in crawl-ref/source/dat/database/randname.txt at line 885 [9.14728]
B:BD[8.16565] → [2.3219:3250]
```
Thorough Guide to @book_magic@
```
[8.16565]
[8.16598]
```
Early Guide to @book_magic@
```
Replacement in crawl-ref/source/dat/database/randname.txt at line 887 [9.14728]
B:BD[8.16599] → [2.3251:3280]
```
Last Secrets of @book_magic@
```
[8.16599]
[8.16630]
```
@the_book_magic@ for Beginners
```

Replacement in crawl-ref/source/dat/database/randname.txt at line 889 [9.14728]

B:BD[8.16635] → [8.16635:16760]

∅:D[8.16760] → [7.8096:8101]

B:BD[7.8096] → [7.8096:8101]

# Book name should be set in make_book_level_randart() or
# make_book_theme_randart(), so if this gets picked there's a bug.
book

[8.16635]

[7.8101]

# level 4-6
moderate level book
Advanced Steps in @the_book_magic@
Advanced Guide to @the_book_magic@
Further Steps in @the_book_magic@

Replacement in crawl-ref/source/dat/database/randname.txt at line 898 [9.14728]
B:BD[7.8102] → [8.16761:16779]
```
Book of Bugginess
```
[7.8102]
[7.8111]
```
Improve Your @book_magic@
```
Replacement in crawl-ref/source/dat/database/randname.txt at line 900 [9.14728]
B:BD[7.8116] → [7.8116:8132]
```
book appearance
```
[7.8116]
[7.8132]
```
# level 7-9
difficult level book
```

Replacement in crawl-ref/source/dat/database/randname.txt at line 903 [9.14728]

B:BD[7.8133] → [8.16780:16797]

@book_adjective@

[7.8133]

[3.3182]

Thorough Guide to @the_book_magic@
Last Secrets of @the_book_magic@
Arcane Secrets of @book_magic@
Intricacies of @the_book_magic@

Also add variety to fixed level randarts, distinguishing between "easy"

Dependencies

In channels

Change contents

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Deletion in crawl-ref/source/dat/database/randname.txt at line 861 [9.14728]

Deletion in crawl-ref/source/dat/database/randname.txt at line 875 [9.14728]

Replacement in crawl-ref/source/dat/database/randname.txt at line 876 [9.14728]

Replacement in crawl-ref/source/dat/database/randname.txt at line 879 [9.14728]

Replacement in crawl-ref/source/dat/database/randname.txt at line 883 [9.14728]

Replacement in crawl-ref/source/dat/database/randname.txt at line 885 [9.14728]

Replacement in crawl-ref/source/dat/database/randname.txt at line 887 [9.14728]

Replacement in crawl-ref/source/dat/database/randname.txt at line 889 [9.14728]

Replacement in crawl-ref/source/dat/database/randname.txt at line 898 [9.14728]

Replacement in crawl-ref/source/dat/database/randname.txt at line 900 [9.14728]

Replacement in crawl-ref/source/dat/database/randname.txt at line 903 [9.14728]