summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohanna Ploog <j-p-e-g@users.sourceforge.net>2009-12-07 02:09:19 +0100
committerJohanna Ploog <j-p-e-g@users.sourceforge.net>2009-12-07 02:09:19 +0100
commitc1bbd6cfcb6202bed4183af1b9c93f14f32ef7e7 (patch)
tree21e6cd0e8c93c3e90cef06e093907187b404462e
parent0af1253c30f2fecd127657f607a43971077a0911 (diff)
downloadcrawl-ref-c1bbd6cfcb6202bed4183af1b9c93f14f32ef7e7.tar.gz
crawl-ref-c1bbd6cfcb6202bed4183af1b9c93f14f32ef7e7.zip
Also disallow randart names "of Protection" to avoid confusion with the ego.
-rw-r--r--crawl-ref/source/dat/database/rand_wpn.txt4
-rw-r--r--crawl-ref/source/dat/database/randname.txt5
2 files changed, 3 insertions, 6 deletions
diff --git a/crawl-ref/source/dat/database/rand_wpn.txt b/crawl-ref/source/dat/database/rand_wpn.txt
index 260dd8a39e..a922853b9b 100644
--- a/crawl-ref/source/dat/database/rand_wpn.txt
+++ b/crawl-ref/source/dat/database/rand_wpn.txt
@@ -201,8 +201,6 @@ Defence by Offence
Offence
-Protection
-
Reinforcement
Expedience
@@ -356,8 +354,6 @@ Turnip
Whelk
-#fungi
-
Mushroom
Toadstool
diff --git a/crawl-ref/source/dat/database/randname.txt b/crawl-ref/source/dat/database/randname.txt
index f35bf68a9e..b55f82731c 100644
--- a/crawl-ref/source/dat/database/randname.txt
+++ b/crawl-ref/source/dat/database/randname.txt
@@ -21,7 +21,7 @@
# o rand_all.txt - keywords used for jewellery
# as well as for all three types
# o randbook.txt - keywords used for randart books
-# o hardcoded (randart.cc)
+# o hardcoded (artefact.cc)
#
# The latter allows the use of phrases elsewhere defined in Crawl. The list of
# hardcoded keywords is as follows:
@@ -36,7 +36,8 @@
# fact, the god will not be picked entirely at random as there are some
# restrictions to make sure that e.g. no good god is chosen for evil weapons,
# that Beogh isn't matched with orc slaying, or that Zin doesn't get picked for
-# randarts with mutagenic properties.
+# randarts with mutagenic properties. Also, if this keyword appears on a divine
+# item gift it will always be replaced by the god doing the gifting.
#
# Randart names may only have a maximum length of 25 symbols (spaces included).
# This comparison takes place after all replacements have been taken care of,