Remove pickup.lua.

Make menu_colour_item_prefix also apply for autopickup_exceptions, so
you can exclude, for example, all evil_eating at once.
Fix Vampires "continuing draining" after having "stopped".


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

3 files changed, 21 insertions, 23 deletions

diff --git a/crawl-ref/settings/autopickup_exceptions.txt b/crawl-ref/settings/autopickup_exceptions.txt
index bff660c3c6..a9ffc2405e 100644
--- a/crawl-ref/settings/autopickup_exceptions.txt
+++ b/crawl-ref/settings/autopickup_exceptions.txt
@@ -5,7 +5,6 @@ ae := autopickup_exceptions
 # curare is always dangerous on the floor
 ae = <curare-tipped
 
-
 ### exclusions ###
 
 # Don't autopickup in the Abyss
@@ -16,17 +15,15 @@ function ch_autopickup(it)
 end
 end >
 
-# Excluding amulets as you only need one of each. Also for some rings.
-# There is some (intended) overlap with pickup.lua, which also excludes
-# the ring of hunger, for example.
+# Exclude potentially useful items of high risk, like ?torment.
+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 = ring of (see invisible|levitation|poison resistance|hunger)
 ae = ring of (fire|ice|sustenance|invisibility)
 ae = ring of (magical power|regeneration)
 
-: if you.god() == "Trog" then
-ae = wizardry
-ae = staff
-: end
-
diff --git a/crawl-ref/settings/init.txt b/crawl-ref/settings/init.txt
index 5dc1d569cc..d489f53e32 100644
--- a/crawl-ref/settings/init.txt
+++ b/crawl-ref/settings/init.txt
@@ -80,7 +80,6 @@ lua_file = lua/runrest.lua
 lua_file = lua/gearset.lua
 lua_file = lua/eat.lua
 lua_file = lua/trapwalk.lua
-lua_file = lua/pickup.lua
 
 # kills.lua yields more information at the cost of huge dumps.
 # lua_file = lua/kills.lua
@@ -215,28 +214,30 @@ include = travel_stoppers.txt
 # sort_menus = pickup: true : basename, qualname, curse, qty
 # msg_condense_repeats = false
 
+
 ##### 4-j	Messages and Display Enhancements #####
 #
 # hp_warning = 10
 # mp_warning = 0
-
 # hp_colour = 50:yellow, 25:red
 # mp_colour = 50:yellow, 25:red
-# status_caption_colour = yellow
-# delay_message_clear    = true
-# show_inventory_weights = true
-# show_gold_turns = true
-# show_beam   = false
-# item_stack_summary_minimum = 5
-# list_rotten = false
-# mlist_min_height = 5
-# msg_max_height = 10
+
+# status_caption_colour        = yellow
+# classic_hud                  = true
+# mlist_min_height             = 5
+# msg_max_height               = 10
 # mlist_allow_alternate_layout = true
-# classic_hud = true
+# show_gold_turns              = true
+
+# delay_message_clear        = true
+# show_inventory_weights     = true
+# item_stack_summary_minimum = 5
+# list_rotten                = false
+
+# show_beam                  = false
 
 #####          Colours (messages and menus) #####
 #
-# menu_colour_prefix_id    = true
 menu_colour_prefix_class = true
 
 # Food is colour coded in standard_colours.txt as follows:
diff --git a/crawl-ref/settings/messages.txt b/crawl-ref/settings/messages.txt
index 91220a39cd..67856347fa 100644
--- a/crawl-ref/settings/messages.txt
+++ b/crawl-ref/settings/messages.txt
@@ -10,7 +10,7 @@ msc = lightred:strangely unstable
 msc = lightred:curare-tipped.*hits you
 msc = lightred:Space warps.* around you
 msc = lightred:Space bends around you
-msc = lightred:is eaten away
+msc = lightred:acid corrodes
 msc = lightred:you are carrying w.* destroyed
 msc = lightred:you are carrying catche?s? fire
 msc = lightred:you are carrying freezes? and shatters?