summaryrefslogtreecommitdiffstats
path: root/crawl-ref/settings
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-11 13:21:31 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-11 13:21:31 +0000
commitc6faa051c8f0f48d5922f9134e611d9ee675162d (patch)
tree9cf7e520bcbac621f7143952450253f1fbeb4d39 /crawl-ref/settings
parent8af56c9f2d1a3e2ef9dbeae0b47263b47f00be42 (diff)
downloadcrawl-ref-c6faa051c8f0f48d5922f9134e611d9ee675162d.tar.gz
crawl-ref-c6faa051c8f0f48d5922f9134e611d9ee675162d.zip
Add lm_props.lua and appry recent commits.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6494 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/settings')
-rw-r--r--crawl-ref/settings/autopickup_exceptions.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/settings/autopickup_exceptions.txt b/crawl-ref/settings/autopickup_exceptions.txt
index a9ffc2405e..af54da7878 100644
--- a/crawl-ref/settings/autopickup_exceptions.txt
+++ b/crawl-ref/settings/autopickup_exceptions.txt
@@ -21,8 +21,8 @@ ae = dangerous_item
# Excluding amulets as you only need one of each. (If you know the
# subtype that means you already have one of it.) Also for some rings.
# Some items may already be excluded as bad_item, e.g. inaccuracy.
-ae = amulet of (inaccuracy|gourmand|controlled flight|warding)
-ae = amulet of (resist mutation|resist slow|clarity|rage)
+ae = amulet of (inaccuracy|the gourmand|controlled flight|warding)
+ae = amulet of (resist .*|clarity|rage|conservation)
ae = ring of (see invisible|levitation|poison resistance|hunger)
ae = ring of (fire|ice|sustenance|invisibility)
ae = ring of (magical power|regeneration)