fiddlerwoaroof/crawl - Change CEZMQA2KOTLG7IO5QBVAM2OALIZJ45CFLNLCG3OQA6IX6URDCCYAC

Allow randart book names of the type "Aerial Bewitchment" or "Fiery

Darkness". (More synonyms welcome!) Also, if a randart book is not a god gift occasionally give it an old owner anyway, using make_name() like for shopkeepers.

I might have fixed the Divination issue. (It looks like for some reason SPELL_NO_SPELL always returns true for Div, though I don't understand why. At least in all three cases where I had this the counter for Div spells was equal to 8 - spells in the book.)

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

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

CEZMQA2KOTLG7IO5QBVAM2OALIZJ45CFLNLCG3OQA6IX6URDCCYAC

Dependencies

In channels

main

Change contents

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

[3.373]

[4.13568]

    else if (one_chance_in(3))
        name += make_name(random_int(), false) + "'s ";

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

[6.5841]

}
bool _spells_need_disc2(spell_type chosen_spells[], int d1, int d2)
{
    for (int i = 0; i < SPELLBOOK_SIZE; i++)
    {
        if (chosen_spells[i] == SPELL_NO_SPELL)
            break;
        // If a spell matches the second type but not the first,
        // we need the second in the title.
        if (!spell_typematch( chosen_spells[i], d1 )
            && spell_typematch( chosen_spells[i], d2))
        {
            return (true);
        }
    }
    return (false);

Insertion in crawl-ref/source/spl-book.cc at line 2198 [5.397614]
[7.2689]
[7.2689]
Insertion in crawl-ref/source/spl-book.cc at line 2266 [5.397614]
[8.9236]
[2.924]
```
    // Count how often each spell school appears in the book.
```

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

[8.9329]

[2.1044]

        if (chosen_spells[i] == SPELL_NO_SPELL)
            continue;

Insertion in crawl-ref/source/spl-book.cc at line 2282 [5.397614]
[8.9330]
[2.1195]
```
    // Remember the two dominant spell schools ...
```
Insertion in crawl-ref/source/spl-book.cc at line 2295 [5.397614]
[2.1476]
[2.1476]
```
    // ... and change disc1 and disc2 accordingly.
```

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

B:BD[2.1499] → [2.1499:1572]

    if (max1 != max2 && count[max2] > 0 && count[max2] >= count[max1]/3)

[2.1499]

[2.1572]

    if (max1 != max2
        && (count[max2] > 1 || _spells_need_disc2(chosen_spells,
                                                  1 << max1, 1 << max2)))
    {

Insertion in crawl-ref/source/spl-book.cc at line 2303 [5.397614]
[2.1599]
[2.1599]
```
    }
```
Insertion in crawl-ref/source/spl-book.cc at line 2309 [5.397614]
[8.9353]
[8.9353]
```
    bool need_quotes = true;
```

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

[8.9463]

    else if (one_chance_in(5)) // Occasionally, use a random name.
    {
        name  = '"';
        name += make_name(random_int(), false) + "'s ";
    }
    else
        need_quotes = false;

Insertion in crawl-ref/source/spl-book.cc at line 2324 [5.397614]
[7.3949]
[7.3949]
```
    name += " of ";
```

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

B:BD[7.3950] → [7.3950:3970]

B:BD[7.3970] → [9.277:352]

    name += " of ";
    std::string type_name = getRandNameString(spelltype_long_name(disc1));

[7.3950]

[9.352]

    // For the actual name there's a 50% chance of getting something like
    //  Flames and Displacement (Fire/Translocation), else
    //  Fiery Translocation
    std::string type_name;
    if (disc1 != disc2 && coinflip())
    {
        std::string search = spelltype_long_name(disc2);
        type_name = getRandNameString(search + " adj");
    }

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

B:BD[9.379] → [9.379:423]

        name += spelltype_long_name(disc1);

[9.379]

[9.423]

    {
        // No adjective found, use the normal method of combining two nouns.
        type_name = getRandNameString(spelltype_long_name(disc1));
        if (type_name.empty())
            name += spelltype_long_name(disc1);
        else
            name += type_name;
        if (disc1 != disc2)
        {
            name += " and ";
            type_name = getRandNameString(spelltype_long_name(disc2));
            if (type_name.empty())
                name += spelltype_long_name(disc2);
            else
                name += type_name;
        }
    }

Deletion in crawl-ref/source/spl-book.cc at line 2357 [5.397614]
B:BD[9.432] → [9.432:459]
∅:D[9.459] → [8.9524:9549]
B:BD[8.9524] → [8.9524:9549]
```
        name += type_name;
    if (disc1 != disc2)
```

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

B:BD[8.9555] → [8.9555:9580]

B:BD[8.9580] → [9.460:527]

        name += " and ";
        type_name = getRandNameString(spelltype_long_name(disc2));

[8.9555]

[9.527]

        name += type_name + " ";

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

[9.528]

        // Add the noun for the first discipline.
        type_name = getRandNameString(spelltype_long_name(disc1));

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

B:BD[9.559] → [9.559:607]

            name += spelltype_long_name(disc2);

[9.559]

[9.607]

            name += spelltype_long_name(disc1);

Replacement in crawl-ref/source/spl-book.cc at line 2368 [5.397614]
B:BD[8.9631] → [8.9631:9658]
```
    if (god != GOD_NO_GOD)
```
[8.9631]
[8.9658]
```
    if (need_quotes)
```
Replacement in crawl-ref/source/effects.cc at line 1444 [5.3382105]
B:BD[7.13209] → [7.13209:13217]
```
       
```
[7.13209]
[7.13217]
Insertion in crawl-ref/source/dat/database/randname.txt at line 911 [10.14728]
[9.3187]
[9.3187]
```
# synonyms for predominant spell schools
```

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

[9.3873]

%%%%
# adjectives for secondary spell school
Conjuration adj
Destructive
%%%%
Enchantment adj
Entchanted
%%%%
Fire adj
Fiery
Scorching
%%%%
Ice adj
Glacial
Freezing
Icy
%%%%
Transmigration adj
Shifting
%%%%
Necromancy adj
Dark
Evil
Lethal
%%%%
Summoning adj
Creative
%%%%
Divination adj
Spiritual
%%%%
Translocation adj
Spatial
%%%%
Poison adj
Poisonous
Venomous
Toxic
%%%%
Earth adj
Earthen
Ashen
Dusty
%%%%
Air adj
Aerial
Flying
Floating
Feathery

Allow randart book names of the type "Aerial Bewitchment" or "Fiery

Dependencies

In channels

Change contents

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Replacement in crawl-ref/source/effects.cc at line 1444 [5.3382105]

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

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