Book acquirement again:

* Weigh magic skills stronger to bias against manuals.
* Fall through to randart (theme) books if all spells are known.
* Allow spell school combinations (Conj/Fire) in naming randarts after
  hell lords and others.


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

1 files changed, 142 insertions, 40 deletions

diff --git a/crawl-ref/source/dat/database/randbook.txt b/crawl-ref/source/dat/database/randbook.txt
index acbef6af85..0bc397000c 100644
--- a/crawl-ref/source/dat/database/randbook.txt
+++ b/crawl-ref/source/dat/database/randbook.txt
@@ -27,6 +27,18 @@
 # a keyword that is used as a prefix for "level book".
 # @level@ is parsed to the word describing the spell level.
 #
+# Books also may get previous "owners" (or authors) that may be the gifting
+# god (if gifted), a name depending on school(s) as defined in this file,
+# a random name, or an appropriate god (if not a god gift).
+# The school dependant names consist of uniques or spell names that have a
+# strong connection to one or more schools. Pandemonium or hell lords' names
+# may only get used if a book is "highlevel", i.e. contains at least one
+# spell of level 6 or higher.
+# If the first and second school are different the two names are tested in
+# combination, in alphabetical order. If this is not the case or nothing is
+# found (or "__NONE" == the empty string was returned) and all spells match
+# the primary school try again with only that one.
+#
 # See the explanation in the main file, randname.txt, for more general
 # information on randart naming.
 ######################################################
@@ -693,27 +705,97 @@ Gliding
 %%%%
 # potential previous owners of books
 # __NONE is parsed to the empty string
-Conjuration owner
+# First, combinations.
+highlevel Conjuration Earth owner
+
+Dispater
+
+@Conjuration Earth owner@
+%%%%
+Conjuration Earth owner
 
 Lee
 
 Lehudib
+%%%%
+highlevel Conjuration Fire owner
 
-Iskenderun
+Asmodeus
 
-Erolcha
+Cerebov
 
-Louise
+w:5
+@Conjuration Fire owner@
+%%%%
+Conjuration Fire owner
+
+Azrael
+
+Margery
+
+__NONE
+%%%%
+highlevel Conjuration Necromancy owner
+
+Ereshkigal
+
+@Conjuration Necromancy owner@
+%%%%
+Conjuration Necromancy owner
 
 Boris
 
 Nergalle
 
-Josephine
+__NONE
+%%%%
+highlevel Conjuration Summoning owner
 
-Frederick
+Asmodeus
+
+Dispater
+
+w:5
+__NONE
 %%%%
-high-level Conjuration owner
+highlevel Conjuration Translocation owner
+
+Lom Lobon
+
+__NONE
+%%%%
+Earth Transmutation owner
+
+Roxanne
+
+__NONE
+%%%%
+highlevel Earth Summoning owner
+
+Dispater
+
+__NONE
+%%%%
+highlevel Fire Summoning owner
+
+Asmodeus
+
+__NONE
+%%%%
+highlevel Necromancy Poison owner
+
+Gloorx Vloq
+
+__NONE
+%%%%
+Necromancy Transmutation owner
+
+Cigotuvi
+
+__NONE
+%%%%
+# Single spell schools.
+highlevel Conjuration owner
 
 Asmodeus
 
@@ -728,6 +810,26 @@ Lom Lobon
 w:30
 @Conjuration owner@
 %%%%
+Conjuration owner
+
+Lee
+
+Lehudib
+
+Iskenderun
+
+Erolcha
+
+Louise
+
+Boris
+
+Nergalle
+
+Josephine
+
+Frederick
+%%%%
 Enchantment owner
 
 Ilsuiw
@@ -738,11 +840,7 @@ Norris
 
 __NONE
 %%%%
-Summoning owner
-
-__NONE
-%%%%
-high-level Summoning owner
+highlevel Summoning owner
 
 Asmodeus
 
@@ -752,15 +850,11 @@ Mnoleg
 
 @Summoning owner@
 %%%%
-Fire owner
-
-Azrael
-
-Margery
+Summoning owner
 
 __NONE
 %%%%
-high-level Fire owner
+highlevel Fire owner
 
 Asmodeus
 
@@ -769,6 +863,14 @@ Cerebov
 w:20
 @Fire owner@
 %%%%
+Fire owner
+
+Azrael
+
+Margery
+
+__NONE
+%%%%
 Ice owner
 
 w:5
@@ -784,6 +886,15 @@ Roxanne
 
 __NONE
 %%%%
+highlevel Necromancy owner
+
+Ereshkigal
+
+Gloorx Vloq
+
+w:40
+@Necromancy owner@
+%%%%
 Necromancy owner
 
 Borgnjor
@@ -800,28 +911,25 @@ Murray
 
 Nergalle
 %%%%
-high-level Necromancy owner
-
-Ereshkigal
-
-Gloorx Vloq
-
-w:40
-@Necromancy owner@
-%%%%
 Divination owner
 
 __NONE
 %%%%
+highlevel Translocation owner
+
+Lom Lobon
+
+@Translocation owner@
+%%%%
 Translocation owner
 
 __NONE
 %%%%
-high-level Translocation owner
+highlevel Poison owner
 
-Lom Lobon
+Gloorx Vloq
 
-@Translocation owner@
+@Poison owner@
 %%%%
 Poison owner
 
@@ -831,11 +939,12 @@ Alistair
 
 __NONE
 %%%%
-high-level Poison owner
+highlevel Earth owner
 
-Gloorx Vloq
+Dispater
 
-@Poison owner@
+w:30
+@Earth owner@
 %%%%
 Earth owner
 
@@ -847,13 +956,6 @@ Roxanne
 
 __NONE
 %%%%
-high-level Earth owner
-
-Dispater
-
-w:30
-@Earth owner@
-%%%%
 Air owner
 
 __NONE