fiddlerwoaroof/crawl - Change ED7MV353FW7C4KZWLXUOEULWZZWMRCJVWMLAFC5OLCKZNPDBLQAQC

FR 2532818: Allow randart books to be named after uniques and legendary mages.

Also, randart books created by acquirement (not gifts) have a chance to be named after the player.

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

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

ED7MV353FW7C4KZWLXUOEULWZZWMRCJVWMLAFC5OLCKZNPDBLQAQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-book.h at line 73 [5.395672]

B:BD[4.5063] → [4.5063:5114]

                             int num_spells = -1);

[4.5063]

[4.5114]

                             int num_spells = -1, std::string owner = "");

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

B:BD[6.5219] → [2.503:575]

bool make_book_level_randart(item_def &book, int level, int num_spells)

[6.5219]

[4.7769]

bool make_book_level_randart(item_def &book, int level, int num_spells,
                             std::string owner)

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

[4.8350]

[2.576]

        if (!owner.empty())
            book.props["owner"].get_string() = owner;

Deletion in crawl-ref/source/spl-book.cc at line 1845 [5.397614]
B:BD[7.1742] → [7.1742:1743]

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

[7.1838]

    // Re-read owner, if applicable.
    if (owner.empty() && book.props.exists("owner"))
        owner = book.props["owner"].get_string();

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

∅:D[3.298] → [8.300:327]

B:BD[4.13483] → [8.300:327]

B:BD[8.327] → [9.368:426]

    if (god != GOD_NO_GOD)
        name += apostrophise(god_name(god, false)) + " ";

[3.298]

[10.269]

    if (!owner.empty())
        name = owner;
    else if (god != GOD_NO_GOD)
        name = god_name(god, false);

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

B:BD[10.300] → [9.427:495]

        name += apostrophise(make_name(random_int(), false)) + " ";

[10.300]

[11.965]

        name = make_name(random_int(), false);

Insertion in crawl-ref/source/spl-book.cc at line 1967 [5.397614]
[3.300]
[3.300]
```
    if (has_owner)
        name = apostrophise(name) + " ";
```
Insertion in crawl-ref/source/spl-book.cc at line 2402 [5.397614]
[12.1775]
[12.1775]
```
    int highest_level = 0;
```
Insertion in crawl-ref/source/spl-book.cc at line 2405 [5.397614]
[12.1858]
[12.1858]
```
    {
```

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

[12.1906]

        if (spell_difficulty(chosen_spells[i]) > highest_level)
            highest_level = spell_difficulty(chosen_spells[i]);
    }

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

[13.1599]

[13.1631]


    // If the owner hasn't been set already use
    // a) the god's name for god gifts (only applies to Sif Muna and Xom),
    // b) a name depending on the spell disciplines, for pure books
    // c) a random name (all god gifts not named earlier)
    // d) an applicable god's name
    // ... else leave it unnamed (around 56% chance for non-god gifts)
    if (owner.empty())
    {
        const bool god_gift = (god != GOD_NO_GOD);
        if (god_gift && !one_chance_in(4))
            owner = god_name(god, false);
        else if (disc1 == disc2
                 && (god_gift && one_chance_in(3) || one_chance_in(5)))
        {
            std::string lookup = spelltype_long_name(disc1);
            if (highest_level >= 6)
                owner = getRandNameString("high-level " + lookup + " owner");

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

∅:D[13.1632] → [6.9330:9352]

B:BD[6.9330] → [6.9330:9352]

    std::string name;

[13.1632]

[6.9352]

            if (owner.empty() || owner == "__NONE")
                owner = getRandNameString(lookup + " owner");
            if (owner == "__NONE")
                owner = "";
        }
        if (owner.empty())
        {
            if (god_gift || one_chance_in(5)) // Use a random name.
                owner = make_name(random_int(), false);
            else if (!god_gift && one_chance_in(8))
            {
                god = GOD_SIF_MUNA;
                switch (disc1)
                {
                case SPTYP_NECROMANCY:
                    if (disc1 == disc2 && !one_chance_in(6))
                        god = GOD_KIKUBAAQUDGHA;
                    break;
                case SPTYP_SUMMONING:
                case SPTYP_CONJURATION:
                    if ((disc2 == SPTYP_SUMMONING || disc2 == SPTYP_CONJURATION)
                        && !one_chance_in(4))
                    {
                        god = GOD_VEHUMET;
                    }
                    break;
                default:
                    break;
                }
                owner = god_name(god, false);
            }
        }
    }
    std::string name = "";

Deletion in crawl-ref/source/spl-book.cc at line 2475 [5.397614]
B:BD[6.9353] → [3.409:483]
```
    const bool god_gift = (god != GOD_NO_GOD);
    bool has_owner = true;
```
Deletion in crawl-ref/source/spl-book.cc at line 2476 [5.397614]
B:BD[14.2756] → [14.2756:2778]
B:BD[14.2778] → [3.484:528]
∅:D[3.528] → [14.2810:2847]
B:BD[14.2810] → [14.2810:2847]
B:BD[14.2847] → [3.529:608]
∅:D[3.608] → [14.2848:2895]
B:BD[10.1353] → [14.2848:2895]
∅:D[14.2895] → [10.1442:1451]
B:BD[10.1442] → [10.1442:1451]
B:BD[10.1451] → [3.609:636]
∅:D[3.636] → [6.9463:9464]
∅:D[10.1480] → [6.9463:9464]
B:BD[6.9463] → [6.9463:9464]
B:BD[6.9464] → [3.637:656]
```
        name = owner;
    else if (god_gift && !one_chance_in(4))
        name = god_name(god, false);
    else if (god_gift || one_chance_in(5)) // Occasionally, use a random name.
        name = make_name(random_int(), false);
    else
        has_owner = false;
    if (has_owner)
```
Insertion in crawl-ref/source/spl-book.cc at line 2477 [5.397614]
[3.662]
[3.662]
```
        name = apostrophise(owner) + " ";
```
Deletion in crawl-ref/source/spl-book.cc at line 2479 [5.397614]
B:BD[3.712] → [3.712:753]
```
        name = apostrophise(name) + " ";
```
Insertion in crawl-ref/source/spl-book.cc at line 2480 [5.397614]
[3.759]
[14.2952]
```
    else
        book.props["is_named"].get_bool() = false;
```

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

B:BD[10.1734] → [10.1734:1847]

        std::string search = spelltype_long_name(disc2);
        type_name = getRandNameString(search + " adj");

[10.1734]

[10.1847]

        std::string lookup = spelltype_long_name(disc2);
        type_name = getRandNameString(lookup + " adj");

Insertion in crawl-ref/source/mon-data.h at line 4081 [5.1826214]
[14.14847]
[14.14847]
```
    // Gets a random spellbook between MST_WIZARD_I and MST_WIZARD_V.
```

Insertion in crawl-ref/source/effects.cc at line 1568 [5.3382105]

[2.5015]


    // Acquired randart books have a chance of being named after the player.
    std::string owner = "";
    if (agent == AQ_SCROLL && one_chance_in(10)
        || agent == AQ_CARD_GENIE && one_chance_in(5))
    {
        owner = you.your_name;
    }

Replacement in crawl-ref/source/effects.cc at line 1580 [5.3382105]
∅:D[2.5066] → [15.2744:2796]
B:BD[7.13878] → [15.2744:2796]
```
        make_book_theme_randart(book, 0, 0, 7, 22);
```
[2.5066]
[7.13981]
```
        make_book_theme_randart(book, 0, 0, 7, 22, SPELL_NO_SPELL, owner);
```

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

B:BD[7.14082] → [7.14082:14140]

        make_book_level_randart(book, level, num_spells);

[7.14082]

[7.14140]

        make_book_level_randart(book, level, num_spells, owner);

Insertion in crawl-ref/source/dat/database/randbook.txt at line 132 [3.3838]
[3.5803]
[3.5803]
```
w:5
```
Insertion in crawl-ref/source/dat/database/randbook.txt at line 134 [3.3838]
[3.5811]
[3.5811]
```
w:5
Spellcasting
```
Insertion in crawl-ref/source/dat/database/randbook.txt at line 147 [3.3838]
[3.5864]
[3.5864]
```
Spell Weaving
```
Insertion in crawl-ref/source/dat/database/randbook.txt at line 442 [3.3838]
[3.8558]
[3.8558]
```
the Traveller
the Compass
the Voyage
```

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

[3.9726]

%%%%
# potential previous owners of books
# __NONE is parsed to the empty string
Conjuration owner
Lee
Lehudib
Iskenderun
Erolcha
Louise
Boris
Nergalle
Josephine
Frederick
%%%%
high-level Conjuration owner
Asmodeus
Ereshkigal
Dispater
Cerebov
Lom Lobon
w:30
@Conjuration owner@

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

[3.9731]

Enchantment owner
Ilsuiw
Rupert
Norris
__NONE
%%%%
Summoning owner
__NONE
%%%%
high-level Summoning owner
Asmodeus
Dispater
Mnoleg
@Summoning owner@
%%%%
Fire owner
Azrael
Margery
__NONE
%%%%
high-level Fire owner
Asmodeus
Cerebov
w:20
@Fire owner@
%%%%
Ice owner
w:5
Ozocubu
__NONE
%%%%
Transmutation owner
Cigotuvi
Roxanne
__NONE
%%%%
Necromancy owner
Borgnjor
Cigotuvi
Boris
Francis
Frances
Murray
Nergalle
%%%%
high-level Necromancy owner
Ereshkigal
Gloorx Vloq
w:40
@Necromancy owner@
%%%%
Divination owner
__NONE
%%%%
Translocation owner
__NONE
%%%%
high-level Translocation owner
Lom Lobon
@Translocation owner@
%%%%
Poison owner
Olgreb
Alistair
__NONE
%%%%
high-level Poison owner
Gloorx Vloq
@Poison owner@
%%%%
Earth owner
Lehudib
Lee
Roxanne
__NONE
%%%%
high-level Earth owner
Dispater
w:30
@Earth owner@
%%%%
Air owner
__NONE
%%%%

FR 2532818: Allow randart books to be named after uniques and legendary mages.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spl-book.h at line 73 [5.395672]

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Insertion in crawl-ref/source/mon-data.h at line 4081 [5.1826214]

Insertion in crawl-ref/source/effects.cc at line 1568 [5.3382105]

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

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

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

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

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

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

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

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