From 5f14cf8ebbe2bcd0de008010281061edfd2c503a Mon Sep 17 00:00:00 2001
From: zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Thu, 29 May 2008 07:33:57 +0000
Subject: Spaces can't be put around the '|' which divide alternate strings in
 a regexp, because the spaces become part of the regexp.

Also, added exceptions for non-vampires and potions of blood, mummies and
any potions or food, and a bunch of race related armour exceptions.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5327 c06c8d41-db1a-0410-9941-cceddc491573
---
 crawl-ref/settings/autopickup_exceptions.txt | 63 ++++++++++++++++++++++++----
 1 file changed, 54 insertions(+), 9 deletions(-)

(limited to 'crawl-ref/settings/autopickup_exceptions.txt')

diff --git a/crawl-ref/settings/autopickup_exceptions.txt b/crawl-ref/settings/autopickup_exceptions.txt
index 81902bac59..f8801db010 100644
--- a/crawl-ref/settings/autopickup_exceptions.txt
+++ b/crawl-ref/settings/autopickup_exceptions.txt
@@ -17,24 +17,33 @@ end
 end >
 
 # universally bad options and scrolls
-ae = potions? of (confusion | degeneration | poison | strong poison)
-ae = potions? of (slowing | paralysis | decay | water)
-ae = scrolls? of (paper | torment | immolation | curse weapon)
-ae = scrolls? of (curse armour | random uselessness | noise)
+ae = potions? of (confusion|degeneration|poison|strong poison)
+ae = potions? of (slowing|paralysis|decay|water)
+ae = scrolls? of (paper|torment|immolation|curse weapon)
+ae = scrolls? of (curse armour|random uselessness|noise|fog)
 
 # Excluding amulets as you only need one of each. Also for some rings.
 # There is some (intended) overlap with pickup.lua, which also exludes
 # the ring of hunger, for example.
-ae = amulet of (inaccuracy | gourmand | controlled flight | warding)
-ae = amulet of (resist mutation | resist slow | clarity | rage)
-ae = ring of (see invisible | levitation | poison resistance | hunger)
-ae = ring of (fire | ice | sustenance | invisibility)
-ae = ring of (magical power | regeneration)
+ae = amulet of (inaccuracy|gourmand|controlled flight|warding)
+ae = amulet of (resist mutation|resist slow|clarity|rage)
+ae = ring of (see invisible|levitation|poison resistance|hunger)
+ae = ring of (fire|ice|sustenance|invisibility)
+ae = ring of (magical power|regeneration)
 
 : if you.race() == "Mummy" or you.race() == "Ghoul" then
 ae = ring of life protection
 : end
 
+: if you.race() == "Mummy" then
+ae = potion
+ae = food
+: end
+
+: if you.race() ~= "Vampire" then
+ae = potion.*blood
+: end
+
 : if you.race() == "Kenku" then
 ae = potions? of levitation
 : end
@@ -44,3 +53,39 @@ ae = wizardry
 ae = staff
 : end
 
+### armour exclusions ###
+
+: if you.race() == "Centaur" then
+ae = boots
+: else
+ae = centaur barding
+: end
+
+: if you.race() == "Naga" then
+ae = boots
+: else
+ae = naga barding
+: end
+
+: if you.race() == "Ogre" or you.race() == "Ogre-Mage"
+:    or you.race() == "Troll" or you.race() == "Spriggan"
+:    or you.race() == "Draconian"
+: then
+ae = boots
+ae = gloves
+ae = helmet
+ae = armour .* (mail|leather)
+: end
+
+: if you.race() == "Spriggan" then
+ae = shield
+: end
+
+: if you.race() == "Ghoul" then
+ae = gloves
+: end
+
+: if you.race() == "Kenku" then
+ae = boots
+ae = helmet
+: end
-- 
cgit v1.2.3-54-g00ecf