diff options
| author | Nicholas Feinberg <pleasingfung@gmail.com> | 2014-07-28 22:49:21 -0700 |
|---|---|---|
| committer | Nicholas Feinberg <pleasingfung@gmail.com> | 2014-07-28 22:49:21 -0700 |
| commit | 583dd66ff5df83761feed2582c87112a0ca7db01 (patch) | |
| tree | 3edd66cf1a9aecead19eca0968d4e1e47ba71127 /crawl-ref/source/spl-book.cc | |
| parent | 732757c6ba3af22d8ff28863a4b9196a996e0ca5 (diff) | |
| download | crawl-ref-583dd66ff5df83761feed2582c87112a0ca7db01.tar.gz crawl-ref-583dd66ff5df83761feed2582c87112a0ca7db01.zip | |
Revert "Remove support for "highlevel author"."
This reverts commit f3a2bd25f4f0be1eb5fe20360efa4cfe85635906.
(And makes hell/pan-lord book names actually work again.)
Diffstat (limited to 'crawl-ref/source/spl-book.cc')
| -rw-r--r-- | crawl-ref/source/spl-book.cc | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc index 29a1e5d561..70cd1e017a 100644 --- a/crawl-ref/source/spl-book.cc +++ b/crawl-ref/source/spl-book.cc @@ -2310,6 +2310,9 @@ bool make_book_theme_randart(item_def &book, owner = god_name(god, false); else if (god_gift && one_chance_in(3) || one_chance_in(5)) { + bool highlevel = (highest_level >= 7 + random2(3) + && (lowest_level > 1 || coinflip())); + if (disc1 != disc2) { string schools[2]; @@ -2318,7 +2321,11 @@ bool make_book_theme_randart(item_def &book, sort(schools, schools + 2); string lookup = schools[0] + " " + schools[1]; - owner = getRandNameString(lookup + " owner"); + if (highlevel) + owner = getRandNameString("highlevel " + lookup + " owner"); + + if (owner.empty() || owner == "__NONE") + owner = getRandNameString(lookup + " owner"); if (owner == "__NONE") owner = ""; @@ -2327,8 +2334,11 @@ bool make_book_theme_randart(item_def &book, if (owner.empty() && all_spells_disc1) { string lookup = spelltype_long_name(disc1); + if (highlevel && disc1 == disc2) + owner = getRandNameString("highlevel " + lookup + " owner"); - owner = getRandNameString(lookup + " owner"); + if (owner.empty() || owner == "__NONE") + owner = getRandNameString(lookup + " owner"); if (owner == "__NONE") owner = ""; |