fiddlerwoaroof/crawl - Change 3CRSIZM7N5F46UWBKM2Y3CNKADWZGLI4JWMUO762ND2TT4247RGQC

Be less strict about spell school restrictions when naming randart

books. Fix titles such as "Sif Muna's A Primer on Magic". Add a fourth step for fixed level naming: starting for level 1.

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

Created by j-p-e-g on January 31, 2009

3CRSIZM7N5F46UWBKM2Y3CNKADWZGLI4JWMUO762ND2TT4247RGQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spl-book.cc at line 1962 [4.397614]

[2.809]

[3.269]

    else if (one_chance_in(30))
        name = god_name(GOD_SIF_MUNA, false);

Replacement in crawl-ref/source/spl-book.cc at line 1976 [4.397614]

∅:D[5.1026] → [6.481:501]

B:BD[6.481] → [6.481:501]

    if (level <= 3)

[5.1026]

[5.1027]

    if (level == 1)
        lookup = "starting";
    else if (level <= 3 || level == 4 && coinflip())

Insertion in crawl-ref/source/spl-book.cc at line 1997 [4.397614]

[6.748]

    if (has_owner)
    {
        if (bookname.substr(0, 4) == "The ")
            bookname = bookname.substr(4);
        else if (bookname.substr(0, 2) == "A ")
            bookname = bookname.substr(2);
        else if (bookname.substr(0, 3) == "An ")
            bookname = bookname.substr(3);
    }

Insertion in crawl-ref/source/spl-book.cc at line 2009 [4.397614]

[6.820]


    if (bookname.find("@level@", 0) != std::string::npos)
    {
        std::string number;
        switch (level)
        {
        case 1: number = "One"; break;
        case 2: number = "Two"; break;
        case 3: number = "Three"; break;
        case 4: number = "Four"; break;
        case 5: number = "Five"; break;
        case 6: number = "Six"; break;
        case 7: number = "Seven"; break;
        case 8: number = "Eight"; break;
        case 9: number = "Nine"; break;
        default:
            number = ""; break;
        }
        bookname = replace_all(bookname, "@level@", number);
    }

Insertion in crawl-ref/source/spl-book.cc at line 2436 [4.397614]

[7.1775]

[2.920]

    // ... and change disc1 and disc2 accordingly.
    disc1 = 1 << max1;
    if (max1 == max2)
        disc2 = disc1;
    else
        disc2 = 1 << max2;

Insertion in crawl-ref/source/spl-book.cc at line 2444 [4.397614]
[2.947]
[7.1775]
```
    bool all_spells_disc1 = true;
```

Insertion in crawl-ref/source/spl-book.cc at line 2452 [4.397614]

[2.1083]


        if (all_spells_disc1 && is_valid_spell(chosen_spells[i])
            && !spell_typematch( chosen_spells[i], disc1 ))
        {
            all_spells_disc1 = false;
        }

Replacement in crawl-ref/source/spl-book.cc at line 2460 [4.397614]
∅:D[2.1090] → [7.1906:1907]
B:BD[7.1906] → [7.1906:1907]
∅:D[7.1907] → [3.1030:1081]
B:BD[3.1030] → [3.1030:1081]
∅:D[3.1081] → [6.1476:1499]
B:BD[6.1476] → [6.1476:1499]
B:BD[6.1499] → [7.1908:1962]
∅:D[3.1248] → [6.1572:1599]
∅:D[7.1962] → [6.1572:1599]
B:BD[6.1572] → [6.1572:1599]
```
    // ... and change disc1 and disc2 accordingly.
    disc1 = 1 << max1;
    if (max1 == max2)
        disc2 = disc1;
    else
        disc2 = 1 << max2;
```
[2.1090]
[2.1091]
```
    // Every spell in the book is of school disc1.
    if (disc1 == disc2)
        all_spells_disc1 = true;
```

Replacement in crawl-ref/source/spl-book.cc at line 2469 [4.397614]

B:BD[2.1376] → [2.1376:1447]

    // ... else leave it unnamed (around 56% chance for non-god gifts)

[2.1376]

[2.1447]

    // ... else leave it unnamed (around 57% chance for non-god gifts)

Replacement in crawl-ref/source/spl-book.cc at line 2475 [4.397614]
B:BD[2.1612] → [2.1612:1644]
```
        else if (disc1 == disc2
```
[2.1612]
[2.1644]
```
        else if (all_spells_disc1
```
Replacement in crawl-ref/source/spl-book.cc at line 2479 [4.397614]
B:BD[2.1787] → [2.1787:1823]
```
            if (highest_level >= 6)
```
[2.1787]
[2.1823]
```
            if (highest_level >= 6 + random2(3))
```

Replacement in crawl-ref/source/spl-book.cc at line 2493 [4.397614]

B:BD[2.2252] → [2.2252:2304]

            else if (!god_gift && one_chance_in(8))

[2.2252]

[2.2304]

            else if (!god_gift && one_chance_in(9))

Replacement in crawl-ref/source/spl-book.cc at line 2499 [4.397614]

B:BD[2.2442] → [2.2442:2503]

                    if (disc1 == disc2 && !one_chance_in(6))

[2.2442]

[2.2503]

                    if (all_spells_disc1 && !one_chance_in(6))

Replacement in crawl-ref/source/spl-book.cc at line 2504 [4.397614]

B:BD[2.2657] → [2.2657:2784]

                    if ((disc2 == SPTYP_SUMMONING || disc2 == SPTYP_CONJURATION)
                        && !one_chance_in(4))

[2.2657]

[2.2784]

                    if ((all_spells_disc1 || disc2 == SPTYP_SUMMONING
                         || disc2 == SPTYP_CONJURATION) && !one_chance_in(4))

Replacement in crawl-ref/source/spl-book.cc at line 2530 [4.397614]

B:BD[8.3950] → [3.1502:1663]

    // For the actual name there's a 50% chance of getting something like
    //  Flames and Displacement (Fire/Translocation), else
    //  Fiery Translocation

[8.3950]

[3.1663]

    // For the actual name there's a 66% chance of getting something like
    //  <book> of the Fiery Traveller (Translocation/Fire), else
    //  <book> of Displacement and Flames.

Replacement in crawl-ref/source/spl-book.cc at line 2534 [4.397614]
B:BD[3.1690] → [3.1690:1728]
```
    if (disc1 != disc2 && coinflip())
```
[3.1690]
[3.1728]
```
    if (disc1 != disc2 && !one_chance_in(3))
```

Replacement in crawl-ref/source/dat/database/randbook.txt at line 25 [9.3838]

B:BD[9.4736] → [9.4736:4906]

# Fixed level books are categorized into "easy" (level 1-3),
# "moderate" (level 4-6) and "difficult" (level 7-9), a keyword that is
# used as a prefix for "level book".

[9.4736]

[9.4906]

# Fixed level books are categorized into "starting" (level 1),
# "easy" (level 2-4), "moderate" (level 4-6) and "difficult" (level 7-9),
# a keyword that is used as a prefix for "level book".
# @level@ is parsed to the word describing the spell level.

Insertion in crawl-ref/source/dat/database/randbook.txt at line 62 [9.3838]
[9.5354]
[9.5354]
```
Catalogue
```
Replacement in crawl-ref/source/dat/database/randbook.txt at line 151 [9.3838]
B:BD[2.6312] → [2.6312:6326]
```
Spell Weaving
```
[2.6312]
[9.5864]
```
Spellweaving
```
Insertion in crawl-ref/source/dat/database/randbook.txt at line 161 [9.3838]
[9.5926]
[9.5926]
```
%%%%
beginners
Beginners
w:5
Neophytes
w:5
Novices
w:3
Rookies
w:2
Absolute Beginners
w:1
Dummies
```

Replacement in crawl-ref/source/dat/database/randbook.txt at line 181 [9.3838]

B:BD[9.5931] → [9.5931:5943]

# level 1-3

[9.5931]

[9.5943]

# level 1
starting level book
@the_book_magic@ for @beginners@
w:2
@the_book_magic@ 101
A Beginning Course on @the_book_magic@
@the_book_magic@, Part One
An Introduction to @the_book_magic@
w:2
An Initiation to @the_book_magic@
First Steps in @the_book_magic@
%%%%
# level 2-4

Replacement in crawl-ref/source/dat/database/randbook.txt at line 207 [9.3838]
B:BD[9.6024] → [9.6024:6056]
```
Early Guide to @the_book_magic@
```
[9.6024]
[9.6056]
```
An Early Guide to @the_book_magic@
```
Replacement in crawl-ref/source/dat/database/randbook.txt at line 209 [9.3838]
B:BD[9.6057] → [9.6057:6088]
```
@the_book_magic@ for Beginners
```
[9.6057]
[9.6088]
```
The Foundations of @book_magic@
```
Deletion in crawl-ref/source/dat/database/randbook.txt at line 211 [9.3838]
B:BD[9.6089] → [9.6089:6152]
```
Foundations of @book_magic@
Introduction to @the_book_magic@
```
Replacement in crawl-ref/source/dat/database/randbook.txt at line 213 [9.3838]
B:BD[9.6171] → [9.6171:6208]
```
Beginning Course on @the_book_magic@
```
[9.6171]
[9.6208]
```
@the_book_magic@, Part @level@
```
Replacement in crawl-ref/source/dat/database/randbook.txt at line 215 [9.3838]
B:BD[9.6209] → [9.6209:6234]
```
w:5
@the_book_magic@ 101
```
[9.6209]
[9.6234]
```
@the_book_magic@ Continued
```
Deletion in crawl-ref/source/dat/database/randbook.txt at line 219 [9.3838]
B:BD[9.6271] → [9.6271:6305]
```
w:1
@the_book_magic@ for Dummies
```
Replacement in crawl-ref/source/dat/database/randbook.txt at line 225 [9.3838]
B:BD[9.6379] → [9.6379:6414]
```
Advanced Guide to @the_book_magic@
```
[9.6379]
[9.6414]
```
The Advanced Guide to @the_book_magic@
```
Replacement in crawl-ref/source/dat/database/randbook.txt at line 229 [9.3838]
B:BD[9.6450] → [9.6450:6477]
```
@the_book_magic@, Part Two
```
[9.6450]
[9.6477]
```
@the_book_magic@, Part @level@
```
Replacement in crawl-ref/source/dat/database/randbook.txt at line 237 [9.3838]
B:BD[9.6563] → [9.6563:6593]
```
Second Course in @book_magic@
```
[9.6563]
[9.6593]
```
The Second Course in @book_magic@
```
Insertion in crawl-ref/source/dat/database/randbook.txt at line 270 [9.3838]
[9.6856]
[9.6856]
```
last_or_lost
Last
Lost
%%%%
```
Replacement in crawl-ref/source/dat/database/randbook.txt at line 279 [9.3838]
B:BD[9.6937] → [9.6937:6972]
```
Thorough Guide to @the_book_magic@
```
[9.6937]
[9.6972]
```
A Thorough Guide to @the_book_magic@
```
Replacement in crawl-ref/source/dat/database/randbook.txt at line 281 [9.3838]
B:BD[9.6973] → [9.6973:7006]
```
Last Secrets of @the_book_magic@
```
[9.6973]
[9.7006]
```
The @last_or_lost@ Secrets of @the_book_magic@
```
Replacement in crawl-ref/source/dat/database/randbook.txt at line 283 [9.3838]
B:BD[9.7007] → [9.7007:7038]
```
Arcane Secrets of @book_magic@
```
[9.7007]
[9.7038]
```
The Arcane Secrets of @book_magic@
```
Replacement in crawl-ref/source/dat/database/randbook.txt at line 285 [9.3838]
B:BD[9.7039] → [9.7039:7071]
```
Intricacies of @the_book_magic@
```
[9.7039]
[9.7071]
```
The Intricacies of @the_book_magic@
```
Replacement in crawl-ref/source/dat/database/randbook.txt at line 287 [9.3838]
B:BD[9.7072] → [9.7072:7111]
```
@book_name@ Greatest Risks and Utility
```
[9.7072]
[9.7111]
```
The @book_noun@ of Greatest Risks and Utility
```
Deletion in crawl-ref/source/dat/database/randbook.txt at line 291 [9.3838]
B:BD[9.7139] → [9.7139:7169]
```
%%%%
last_or_lost
Last
Lost
```
Replacement in crawl-ref/source/dat/database/randbook.txt at line 298 [9.3838]
B:BD[9.7295] → [9.7295:7347]
```
@last_or_lost@ @book_noun@ of @the_powerful_caster@
```
[9.7295]
[9.7347]
```
The @last_or_lost@ @book_noun@ of @the_powerful_caster@
```
Replacement in crawl-ref/source/dat/database/randbook.txt at line 301 [9.3838]
B:BD[9.7352] → [9.7352:7387]
```
Testament of @the_powerful_caster@
```
[9.7352]
[9.7387]
```
The Testament of @the_powerful_caster@
```

Be less strict about spell school restrictions when naming randart

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/spl-book.cc at line 1962 [4.397614]

Replacement in crawl-ref/source/spl-book.cc at line 1976 [4.397614]

Insertion in crawl-ref/source/spl-book.cc at line 1997 [4.397614]

Insertion in crawl-ref/source/spl-book.cc at line 2009 [4.397614]

Insertion in crawl-ref/source/spl-book.cc at line 2436 [4.397614]

Insertion in crawl-ref/source/spl-book.cc at line 2444 [4.397614]

Insertion in crawl-ref/source/spl-book.cc at line 2452 [4.397614]

Replacement in crawl-ref/source/spl-book.cc at line 2460 [4.397614]

Replacement in crawl-ref/source/spl-book.cc at line 2469 [4.397614]

Replacement in crawl-ref/source/spl-book.cc at line 2475 [4.397614]

Replacement in crawl-ref/source/spl-book.cc at line 2479 [4.397614]

Replacement in crawl-ref/source/spl-book.cc at line 2493 [4.397614]

Replacement in crawl-ref/source/spl-book.cc at line 2499 [4.397614]

Replacement in crawl-ref/source/spl-book.cc at line 2504 [4.397614]

Replacement in crawl-ref/source/spl-book.cc at line 2530 [4.397614]

Replacement in crawl-ref/source/spl-book.cc at line 2534 [4.397614]

Replacement in crawl-ref/source/dat/database/randbook.txt at line 25 [9.3838]

Insertion in crawl-ref/source/dat/database/randbook.txt at line 62 [9.3838]

Replacement in crawl-ref/source/dat/database/randbook.txt at line 151 [9.3838]

Insertion in crawl-ref/source/dat/database/randbook.txt at line 161 [9.3838]

Replacement in crawl-ref/source/dat/database/randbook.txt at line 181 [9.3838]

Replacement in crawl-ref/source/dat/database/randbook.txt at line 207 [9.3838]

Replacement in crawl-ref/source/dat/database/randbook.txt at line 209 [9.3838]

Deletion in crawl-ref/source/dat/database/randbook.txt at line 211 [9.3838]

Replacement in crawl-ref/source/dat/database/randbook.txt at line 213 [9.3838]

Replacement in crawl-ref/source/dat/database/randbook.txt at line 215 [9.3838]

Deletion in crawl-ref/source/dat/database/randbook.txt at line 219 [9.3838]

Replacement in crawl-ref/source/dat/database/randbook.txt at line 225 [9.3838]

Replacement in crawl-ref/source/dat/database/randbook.txt at line 229 [9.3838]

Replacement in crawl-ref/source/dat/database/randbook.txt at line 237 [9.3838]

Insertion in crawl-ref/source/dat/database/randbook.txt at line 270 [9.3838]

Replacement in crawl-ref/source/dat/database/randbook.txt at line 279 [9.3838]

Replacement in crawl-ref/source/dat/database/randbook.txt at line 281 [9.3838]

Replacement in crawl-ref/source/dat/database/randbook.txt at line 283 [9.3838]

Replacement in crawl-ref/source/dat/database/randbook.txt at line 285 [9.3838]

Replacement in crawl-ref/source/dat/database/randbook.txt at line 287 [9.3838]

Deletion in crawl-ref/source/dat/database/randbook.txt at line 291 [9.3838]

Replacement in crawl-ref/source/dat/database/randbook.txt at line 298 [9.3838]

Replacement in crawl-ref/source/dat/database/randbook.txt at line 301 [9.3838]