fiddlerwoaroof/crawl - Change EZOLOYGEKWHZKTETREC3LK3RZFRBJJHR6O4EQT2WOZYXLFYPDXVQC

Make the "more" line of the spell memorization menu show the number of

available spell levels, the number of spell books which can't be read from, and the number of spells which can't be memorized due to player's species.

Make the spell memorization confirmation prompt show the number of spell levels to be consumed by memorization, and the number which will be left after memorization.

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

Created by zelgadis on June 25, 2009

EZOLOYGEKWHZKTETREC3LK3RZFRBJJHR6O4EQT2WOZYXLFYPDXVQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-book.cc at line 1297 [3.397614]

B:BD[2.521] → [2.521:575]

                          spells_to_books &book_hash)

[2.521]

[3.426286]

                          spells_to_books &book_hash,
                          unsigned int &num_unreadable,
                          unsigned int &num_race)

Replacement in crawl-ref/source/spl-book.cc at line 1301 [3.397614]

B:BD[4.1028] → [4.1028:1119]

    bool book_errors    = false;
    int  num_books      = 0;
    int  num_unreadable = 0;

[3.426288]

[4.1119]

    bool          book_errors    = false;
    unsigned int  num_books      = 0;
                  num_unreadable = 0;

Replacement in crawl-ref/source/spl-book.cc at line 1375 [3.397614]
B:BD[4.2801] → [4.2801:2838]
```
    unsigned int num_race       = 0;
```
[4.2801]
[4.2838]
```
                 num_race       = 0;
```

Replacement in crawl-ref/source/spl-book.cc at line 1467 [3.397614]

B:BD[2.2317] → [2.2317:2381]

                                    spells_to_books &book_hash)

[2.2317]

[4.6227]

                                    spells_to_books &book_hash,
                                    unsigned long num_unreadable,
                                    unsigned long num_race)

Insertion in crawl-ref/source/spl-book.cc at line 1496 [3.397614]

[4.7025]

[5.312]


    std::string more_str = make_stringf("%d spell level%s left",
                                        player_spell_levels(),
                                        player_spell_levels() > 1 ? "s" : "");
    if (num_unreadable > 0)
        more_str += make_stringf(", %u unreadable spellbook%s",
                                 num_unreadable,
                                 num_unreadable > 1 ? "s" : "");

Insertion in crawl-ref/source/spl-book.cc at line 1506 [3.397614]

[5.313]

[4.7027]

    if (num_race > 0)
        more_str += make_stringf(", %u spell%s unmemorizable", num_race,
                                 num_race > 1 ? "s" : "");
    spell_menu.set_more(formatted_string(more_str));

Replacement in crawl-ref/source/spl-book.cc at line 1604 [3.397614]

B:BD[4.8918] → [2.2758:2805]

    if (!_get_mem_list(mem_spells, book_hash))

[4.8918]

[3.427750]

    unsigned int num_unreadable, num_race;
    if (!_get_mem_list(mem_spells, book_hash, num_unreadable, num_race))

Replacement in crawl-ref/source/spl-book.cc at line 1609 [3.397614]

B:BD[4.8948] → [2.2806:2875]

    spell_type specspell = _choose_mem_spell(mem_spells, book_hash);

[4.8948]

[3.427780]

    spell_type specspell = _choose_mem_spell(mem_spells, book_hash,
                                             num_unreadable, num_race);

Replacement in crawl-ref/source/spl-book.cc at line 1674 [3.397614]

B:BD[3.429401] → [6.139069:139140]

    snprintf(info, INFO_SIZE, "Memorise %s?", spell_title(specspell));

[3.429401]

[7.269]

    snprintf(info, INFO_SIZE,
             "Memorise %s, consuming %d spell level%s and leaving %d?",
             spell_title(specspell), spell_levels_required(specspell),
             spell_levels_required(specspell) > 1 ? "s" : "",
             player_spell_levels() - spell_levels_required(specspell));