Merge branch 'mon-pickup'

The problem with monster pickup of the type that this branch removes
is that it encourages tedious behaviour to achieve the optimum result.

While in general people don't bother to pick up every weapon and armour
and stuff it upstairs, that would be a way to prevent monsters from ever
picking up items you've seen. With Apportation, you don't even have to
reach the item, and on a mummy, say, you don't even have to worry about
the infintesimal food cost. People do already do this for chaos and
distortion weapons, and it is not a very good thing.

Not allowing allies to pick up items is related, in that it means that the
code can be simpler, but it also has problems of micromanagement,
weirdnesses with the ctrl-T command, and allies already have their share
of problems. I hope that the compensations for Beogh and mercenaries make
up for what is lost in terms of fun.

Conflicts:
	crawl-ref/source/tag-version.h

1 files changed, 1 insertions, 25 deletions

diff --git a/crawl-ref/docs/options_guide.txt b/crawl-ref/docs/options_guide.txt
index c669a86897..a0040ed123 100644
--- a/crawl-ref/docs/options_guide.txt
+++ b/crawl-ref/docs/options_guide.txt
@@ -25,7 +25,7 @@ The contents of this text are:
                 autopickup, autopickup_exceptions, default_autopickup,
                 autopickup_no_burden, pickup_thrown, chunks_autopickup,
                 assign_item_slot, pickup_menu, pickup_menu_limit,
-                drop_filter, default_friendly_pickup
+                drop_filter
 3-b     Targeting.
                 darken_beyond_range
 3-c     Passive Sightings (detected and remembered entities).
@@ -522,30 +522,6 @@ drop_filter += <regex>, <regex>, ...
         set/clear selection of items that match the filter
         expression(s).
 
-default_friendly_pickup = (friend | player | none | all)
-        Using an in-game toggle, you can control what types of items
-        your allies will pick up:
-             none   = They won't pick up anything at all.
-             friend = They may pick up anything they or another ally
-                      dropped, e.g. if another ally dies.
-                      (This is the default setting.)
-             player = Like 'friend', but they may also pick up anything
-                      you've dropped or thrown.
-             all    = They may pick up anything they want to have.
-                      (This is how it works for hostile monsters.)
-
-        This option controls which is the default setting for this toggle
-        when you start a new game, or when you enter a level for the first
-        time.
-
-        Note that this only works for intelligent allies (such as those you can
-        get when worshipping Beogh), and that monsters have their own
-        reasonings for which items they may need, and when they feel safe
-        enough to pick them up. Except for "none", these options won't let you
-        override these requirements.
-        Also, friendly jellies won't ever eat any items, regardless of
-        this option.
-
 3-b     Targeting.
 -------------------