* Add a prompt when attacking monsters with an inappropriate weapon or

  when attempting to use (controlled) berserk while wielding an
  inappropriate weapon. (FR 1956656)

* Make monsters stop patrolling/travelling if they change levels (or are
  banished).

* Disable the friendly pickup toggle for characters unable to use them.
  Currently, only worshippers of TSO and Beogh are capable of gaining
  allies that are permanent (not summoned), permanently friendly (not
  charmed) and intelligent enough to pick up stuff (no zombies). I don't
  know if you keep your friends if you leave TSO. If so, the toggle
  should be enabled while that is the case (i.e. if you're still
  worshipping a good god)

* Re-order the wizmode commands in the help screen. They're now not
  listed strictly alphabetically anymore, but rather sorted into
  different categories that should make actually finding commands easier.



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

1 files changed, 16 insertions, 1 deletions

diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 7f640c8d34..d7384a03d0 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -1952,6 +1952,19 @@ void process_command( command_type cmd )
 
     case CMD_TOGGLE_FRIENDLY_PICKUP:
     {
+        if (you.religion != GOD_SHINING_ONE && you.religion != GOD_BEOGH)
+        {
+            mpr("I'm sorry, your allies won't ever be able to pick up items.");
+            if (Options.tutorial_left)
+            {
+                mpr("Only intelligent permanent allies may equip themselves, "
+                    "and these two restrictions are only met by allies of the "
+                    "followers of two gods in the pantheon: the Shining One "
+                    "and Beogh.", MSGCH_TUTORIAL);
+            }
+            break;
+        }
+
         // Toggle pickup mode for friendlies.
         _print_friendly_pickup_setting(false);
         mpr("Change to (d)efault, (n)othing, (f)riend-dropped, or (a)ll? ",
@@ -4047,7 +4060,9 @@ static bool _initialise(void)
 
     if (newc) // start a new game
     {
-        you.friendly_pickup = Options.default_friendly_pickup;
+        you.friendly_pickup = FRIENDLY_PICKUP_NONE;
+        if (you.religion == GOD_BEOGH || you.religion == GOD_SHINING_ONE)
+            you.friendly_pickup = Options.default_friendly_pickup;
 
         // Mark items in inventory as of unknown origin.
         origin_set_inventory(origin_set_unknown);