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, 0 insertions, 57 deletions

diff --git a/crawl-ref/source/main.cc b/crawl-ref/source/main.cc
index 84bd11d54c..bde58e789b 100644
--- a/crawl-ref/source/main.cc
+++ b/crawl-ref/source/main.cc
@@ -1014,7 +1014,6 @@ static bool _cmd_is_repeatable(command_type cmd, bool is_again = false)
 
     // Miscellaneous non-repeatable commands.
     case CMD_TOGGLE_AUTOPICKUP:
-    case CMD_TOGGLE_FRIENDLY_PICKUP:
     case CMD_TOGGLE_TRAVEL_SPEED:
     case CMD_ADJUST_INVENTORY:
     case CMD_QUIVER_ITEM:
@@ -1667,34 +1666,6 @@ static void _experience_check()
 #endif
 }
 
-static void _print_friendly_pickup_setting(bool was_changed)
-{
-    string now = (was_changed? "now " : "");
-
-    if (you.friendly_pickup == FRIENDLY_PICKUP_NONE)
-    {
-        mprf("Your intelligent allies are %sforbidden to pick up anything at all.",
-             now.c_str());
-    }
-    else if (you.friendly_pickup == FRIENDLY_PICKUP_FRIEND)
-    {
-        mprf("Your intelligent allies may %sonly pick up items dropped by allies.",
-             now.c_str());
-    }
-    else if (you.friendly_pickup == FRIENDLY_PICKUP_PLAYER)
-    {
-        mprf("Your intelligent allies may %sonly pick up items dropped by you "
-             "and your allies.", now.c_str());
-    }
-    else if (you.friendly_pickup == FRIENDLY_PICKUP_ALL)
-    {
-        mprf("Your intelligent allies may %spick up anything they need.",
-             now.c_str());
-    }
-    else
-        mprf(MSGCH_ERROR, "Your allies%s are collecting bugs!", now.c_str());
-}
-
 static void _do_remove_armour()
 {
     if (you.species == SP_FELID)
@@ -1714,33 +1685,6 @@ static void _do_remove_armour()
         takeoff_armour(index);
 }
 
-static void _toggle_friendly_pickup()
-{
-    // Toggle pickup mode for friendlies.
-    _print_friendly_pickup_setting(false);
-
-    mprf(MSGCH_PROMPT, "Change to (d)efault, (n)othing, (f)riend-dropped, "
-                       "(p)layer, or (a)ll? ");
-
-    int type;
-    {
-        cursor_control con(true);
-        type = toalower(getchm(KMC_DEFAULT));
-    }
-
-    switch (type)
-    {
-    case 'd': you.friendly_pickup = Options.default_friendly_pickup; break;
-    case 'n': you.friendly_pickup = FRIENDLY_PICKUP_NONE; break;
-    case 'f': you.friendly_pickup = FRIENDLY_PICKUP_FRIEND; break;
-    case 'p': you.friendly_pickup = FRIENDLY_PICKUP_PLAYER; break;
-    case 'a': you.friendly_pickup = FRIENDLY_PICKUP_ALL; break;
-    default: canned_msg(MSG_OK); return;
-    }
-
-    _print_friendly_pickup_setting(true);
-}
-
 static void _toggle_travel_speed()
 {
     you.travel_ally_pace = !you.travel_ally_pace;
@@ -1927,7 +1871,6 @@ void process_command(command_type cmd)
         mprf("Autopickup is now %s.", Options.autopickup_on > 0 ? "on" : "off");
         break;
 
-    case CMD_TOGGLE_FRIENDLY_PICKUP:     _toggle_friendly_pickup(); break;
     case CMD_TOGGLE_VIEWPORT_MONSTER_HP: toggle_viewport_monster_hp(); break;
     case CMD_TOGGLE_TRAVEL_SPEED:        _toggle_travel_speed(); break;