summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/dat/database/miscname.txt
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-01 02:29:25 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-01 02:29:25 +0000
commitfa362030f57011d35e9e254b86b193c971132dfa (patch)
tree2d850acb1ce2879ac4702a4b73b4b722cdebf108 /crawl-ref/source/dat/database/miscname.txt
parent1aa4e8906e9d1db62973cecf451236247e5d94b6 (diff)
downloadcrawl-ref-fa362030f57011d35e9e254b86b193c971132dfa.tar.gz
crawl-ref-fa362030f57011d35e9e254b86b193c971132dfa.zip
Clean up and consolidate random_uselessness(), as well as its associated
outsourced text. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5388 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/dat/database/miscname.txt')
-rw-r--r--crawl-ref/source/dat/database/miscname.txt46
1 files changed, 25 insertions, 21 deletions
diff --git a/crawl-ref/source/dat/database/miscname.txt b/crawl-ref/source/dat/database/miscname.txt
index 4b6e152662..010078dfbd 100644
--- a/crawl-ref/source/dat/database/miscname.txt
+++ b/crawl-ref/source/dat/database/miscname.txt
@@ -5,7 +5,7 @@
#
# This file contains a list of names for miscellaneous things.
# This is currently only used for colours, writing types,
-# roaring animals, smells, and sounds.
+# smells, and sounds.
######################################################
%%%%
glowing_adj
@@ -158,6 +158,27 @@ writing_name
@writing_adj@ @colour_name@ @writing_noun@
%%%%
+smell_name
+
+baking bread
+
+burning hair
+
+coffee
+
+fire and brimstone
+
+salt
+
+womething weird
+
+sulphur
+
+tea
+
+wet wool
+
+%%%%
roaring_animal_name
# This doesn't necessarily have to make sense. For example, a name of a
# fruit or an insect will work here.
@@ -177,24 +198,7 @@ pill bug
slug
-%%%%
-smell_name
-
-baking bread
-
-burning hair
-
-coffee
-
-fire and brimstone
-
-salt
-
-womething weird
-
-sulphur
-
-wet wool
+yak
%%%%
sound_name
@@ -207,11 +211,11 @@ a very strange noise indeed
a voice calling someone else's name
-roaring flame
+roaring flames
snatches of song
-the bellowing of a yak
+the distant roaring of an enraged @roaring_animal_name@
the chiming of a distant gong