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 15:32:32 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-11 15:32:32 +0000
commit42a287ebc7f5cd9b483966c1419c3020036c342d (patch)
tree7593f84614af877a2fb60dddcee3989cbb406d07 /crawl-ref/settings
parentf35e944cc23bebb7bb0dffb7697f24804b572d87 (diff)
downloadcrawl-ref-42a287ebc7f5cd9b483966c1419c3020036c342d.tar.gz
crawl-ref-42a287ebc7f5cd9b483966c1419c3020036c342d.zip
Some more tweaks to starting equipment and skills.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6498 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/settings')
-rw-r--r--crawl-ref/settings/autopickup_exceptions.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/settings/autopickup_exceptions.txt b/crawl-ref/settings/autopickup_exceptions.txt
index c5d82e26a5..af54da7878 100644
--- a/crawl-ref/settings/autopickup_exceptions.txt
+++ b/crawl-ref/settings/autopickup_exceptions.txt
@@ -22,7 +22,7 @@ ae = dangerous_item
# 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|the gourmand|controlled flight|warding)
-ae = amulet of (resist .*|clarity|rage|conversation)
+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)