Remove Beogh recalling orcs for you, and instead try harder to find

existing followers on the level (with decreasing chances) to bless them.
This lowers probability of the reinforcement effect from 10% to 2.5% 
if bless_follower() is called without any parameters in the first place.

Greatly reduce chances for orcs talking, and tidy up monspeak.txt a bit
to make comparing chances easier.

Add the promised friendly pickup toggle (command on Ctrl-T), and a new 
option for its default value. Modify documentation accordingly.

Fix 1947256: hunger state not shown at game reload.


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

1 files changed, 23 insertions, 1 deletions

diff --git a/crawl-ref/docs/options_guide.txt b/crawl-ref/docs/options_guide.txt
index d5e940a222..6d5356f477 100644
--- a/crawl-ref/docs/options_guide.txt
+++ b/crawl-ref/docs/options_guide.txt
@@ -24,7 +24,8 @@ The contents of this text are:
 4-a     Dropping and Picking up.
                 autopickup, autopickup_exceptions, default_autopickup,
                 autopickup_no_burden, pickup_thrown, pickup_dropped,
-                assign_item_slot, drop_mode, pickup_mode, drop_filter
+                assign_item_slot, drop_mode, pickup_mode, drop_filter,
+                default_friendly_pickup
 4-b     Targeting.
                 target_zero_exp, target_oos, target_los_first,
                 default_target, target_unshifted_dirs
@@ -425,6 +426,27 @@ drop_filter = <regex>
         set/clear selection of items that match the filter 
         expression(s).
 
+default_friendly_pickup = (none | friend | 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.
+                      (This is the old friendly pick up behaviour.)
+             friend = They will pick up anything they or another ally 
+                      dropped, e.g. if another ally dies.
+                      (This is the default value.)
+             all    = They will 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 or reload a game, or when you enter a level for
+        the first time.
+
+        Note 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. 
+        Also, friendly jellies won't ever eat any items, regardless of this 
+        option.
+
 4-b     Targeting.
 -------------------