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, 3 insertions, 4 deletions

diff --git a/crawl-ref/source/mon-act.cc b/crawl-ref/source/mon-act.cc
index 8ef516f06d..452f229127 100644
--- a/crawl-ref/source/mon-act.cc
+++ b/crawl-ref/source/mon-act.cc
@@ -2114,13 +2114,12 @@ void handle_monster_move(monster* mons)
         && (mons_itemuse(mons) >= MONUSE_WEAPONS_ARMOUR
             || mons_itemeat(mons) != MONEAT_NOTHING))
     {
-        // Keep neutral, charmed, summoned monsters from picking up stuff.
-        // Same for friendlies if friendly_pickup is set to "none".
+        // Keep neutral, charmed, summoned, and friendly monsters from
+        // picking up stuff.
         if ((!mons->neutral() && !mons->has_ench(ENCH_CHARM)
              || (you_worship(GOD_JIYVA) && mons_is_slime(mons)))
             && !mons->is_summoned() && !mons->is_perm_summoned()
-            && (!mons->friendly()
-                || you.friendly_pickup != FRIENDLY_PICKUP_NONE))
+            && !mons->friendly())
         {
             if (_handle_pickup(mons))
             {