Yikes, so many files! And all I did was add more item evaluation

functions for menu colouring and pickup...

Added: emergency_item, good_item, dangerous_item, bad_item, and
       useless_item, all taking into account player species and
       mutations, so e.g. =see invisible is useless for Naga,
       and !poison is always bad but only useless if you don't
       know Evaporate.

Never autopickup useless, dangerous (e.g. ?immolation) or inedible items, 
and simplify the item colour/pickup options accordingly. I'll have to
see if pickup.lua is still even needed after this.

Removed the menu_colour_prefix_id option as I can't see any reason to
turn it off.

Oh, and fixed a bug where Kenku were unable to stop levitating if they
gained level 15 while levitating.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5658 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 1 insertions, 60 deletions

diff --git a/crawl-ref/settings/autopickup_exceptions.txt b/crawl-ref/settings/autopickup_exceptions.txt
index 8e93c254ae..bff660c3c6 100644
--- a/crawl-ref/settings/autopickup_exceptions.txt
+++ b/crawl-ref/settings/autopickup_exceptions.txt
@@ -16,14 +16,8 @@ function ch_autopickup(it)
 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)
-
 # Excluding amulets as you only need one of each. Also for some rings.
-# There is some (intended) overlap with pickup.lua, which also exludes
+# There is some (intended) overlap with pickup.lua, which also excludes
 # the ring of hunger, for example.
 ae = amulet of (inaccuracy|gourmand|controlled flight|warding)
 ae = amulet of (resist mutation|resist slow|clarity|rage)
@@ -31,61 +25,8 @@ 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
-
 : if you.god() == "Trog" then
 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