diff options
| author | Jude Brown <bookofjude@users.sourceforge.net> | 2009-12-08 23:38:59 +1000 |
|---|---|---|
| committer | Jude Brown <bookofjude@users.sourceforge.net> | 2009-12-08 23:38:59 +1000 |
| commit | 48997de9e2dac727558ebcb306a83d9a241b450e (patch) | |
| tree | 95756b9d78ed3e391389b5e21270ffb2f2fbef43 /crawl-ref/source/dat/database | |
| parent | d6c68db9e495b205933b9ed157d73332d8dbb492 (diff) | |
| parent | de30595826d2800afff619d6a1dc01c0d3610950 (diff) | |
| download | crawl-ref-48997de9e2dac727558ebcb306a83d9a241b450e.tar.gz crawl-ref-48997de9e2dac727558ebcb306a83d9a241b450e.zip | |
Merge branch 'master' into wizlab
Diffstat (limited to 'crawl-ref/source/dat/database')
| -rw-r--r-- | crawl-ref/source/dat/database/rand_wpn.txt | 4 | ||||
| -rw-r--r-- | crawl-ref/source/dat/database/randname.txt | 5 |
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, |