summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/dat/database
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-03-08 17:00:33 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-03-08 17:00:33 +0000
commit6760ab3170033b2ecceb6ced51e2de7a5d78d6fe (patch)
tree9d5ed416ad5402c17ae593404ca6589d8c07a3ba /crawl-ref/source/dat/database
parent1854b1209c376c3e3359b4d8a54f9bbf38e1a5ba (diff)
downloadcrawl-ref-6760ab3170033b2ecceb6ced51e2de7a5d78d6fe.tar.gz
crawl-ref-6760ab3170033b2ecceb6ced51e2de7a5d78d6fe.zip
* Rarely, allow randart books to use entirely random names.
* Use monsters' 'x' descriptions as inf.title when hovering your mouse over monster tiles. * A bit of code cleanup. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9385 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/dat/database')
-rw-r--r--crawl-ref/source/dat/database/rand_arm.txt13
-rw-r--r--crawl-ref/source/dat/database/randbook.txt52
-rw-r--r--crawl-ref/source/dat/database/randname.txt2
3 files changed, 60 insertions, 7 deletions
diff --git a/crawl-ref/source/dat/database/rand_arm.txt b/crawl-ref/source/dat/database/rand_arm.txt
index 8fc562e800..0c78510388 100644
--- a/crawl-ref/source/dat/database/rand_arm.txt
+++ b/crawl-ref/source/dat/database/rand_arm.txt
@@ -4,7 +4,7 @@
# rand_arm.txt: keywords for randart ARMOUR
#
# This file contains the lists of keywords (and their
-# weights) for most of the keywords used for randart
+# weights) for most of the keywords used for randart
# armour. You will find others in rand_wpn.txt and
# rand_all.txt, respectively.
#
@@ -91,12 +91,12 @@ the Garden
# non-Crawl critters
critter_name
-the Slorg
+Slorg
-the Alphagorgon
+Alphagorgon
# from the crawl.akrasiac.org patch.
-the Hot Ocelot
+Hot Ocelot
Eight Boll Weevils
%%%%
@@ -192,7 +192,8 @@ the Invisible Hand
Divine Intervention
%%%%
-# in contrast to "wacky_armour_name" these do have some connection to armour and protection
+# in contrast to "wacky_armour_name" these do have some
+# connection to armour and protection
armour_name_shielding
Shielding
@@ -322,7 +323,7 @@ the Accordion
the Bagpipe
the Lute
-%%%%
+%%%%
evil_being
the Devil
diff --git a/crawl-ref/source/dat/database/randbook.txt b/crawl-ref/source/dat/database/randbook.txt
index 0bc397000c..80de91d40f 100644
--- a/crawl-ref/source/dat/database/randbook.txt
+++ b/crawl-ref/source/dat/database/randbook.txt
@@ -92,6 +92,58 @@ w:9
w:4
@book_noun_on@ on
%%%%
+# @book_noun@ of ...
+random_book_title
+
+w:15
+the @book_plant_animal@
+
+w:20
+@number_or_qualifier@ @thing_names@
+
+w:4
+the @profession_name@
+
+w:13
+@philosophy_or_science@
+
+w:8
+@wacky_armour_name@
+
+w:2
+@destiny_name@
+
+w:6
+@place_name@
+
+w:1
+@magic_name@
+
+w:4
+@substance_name@
+
+w:2
+@power_name@
+
+w:2
+@mental_illness_weapon@
+%%%%
+book_plant_animal
+
+w:1
+@jewellery_animal@
+
+w:1
+@critter_name@
+
+w:1
+@plant_name@
+
+w:6
+@weapon_animal@
+
+@armour_animal@
+%%%%
book_adjective
glistering
diff --git a/crawl-ref/source/dat/database/randname.txt b/crawl-ref/source/dat/database/randname.txt
index ef392f162b..e46bbda9c0 100644
--- a/crawl-ref/source/dat/database/randname.txt
+++ b/crawl-ref/source/dat/database/randname.txt
@@ -189,7 +189,7 @@ w:3
of @flower_name@
w:3
-of @critter_name@
+of the @critter_name@
w:5
of @evil_being@