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:00:50 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-11 13:00:50 +0000
commit6622dd9e4820835af7bd93903346a6282db61cf3 (patch)
treee19d20fccdea039bd668299602b96ea867ef8c04 /crawl-ref/settings
parent5da77fd18ee63339cbb9fba9b23a04188b08c6e5 (diff)
downloadcrawl-ref-6622dd9e4820835af7bd93903346a6282db61cf3.tar.gz
crawl-ref-6622dd9e4820835af7bd93903346a6282db61cf3.zip
Add missing amulet types to autopickup_exceptions.txt (BR 2013462)
Add short descriptions of Makhleb's powers. Fix wrong colouring of single level resistances. (BR 2015107) git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6493 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..c5d82e26a5 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|conversation)
ae = ring of (see invisible|levitation|poison resistance|hunger)
ae = ring of (fire|ice|sustenance|invisibility)
ae = ring of (magical power|regeneration)