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

diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index 074f8d3482..cdefa08af0 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -627,6 +627,8 @@ void game_options::reset_options()
 
     autopickup_on = true;
     autoprayer_on = false;
+    default_friendly_pickup = 0; // allies may only pickup items
+    friendly_pickup         = 0; // dropped by allies
     show_more_prompt = true;
 
     show_gold_turns = false;
@@ -1800,6 +1802,15 @@ void game_options::read_option_line(const std::string &str, bool runscript)
     else BOOL_OPTION(use_old_selection_order);
     else BOOL_OPTION_NAMED("default_autopickup", autopickup_on);
     else BOOL_OPTION_NAMED("default_autoprayer", autoprayer_on);
+    else if (key == "default_friendly_pickup")
+    {
+        if (field == "none")
+            friendly_pickup = -1;
+        else if (field == "all")
+            friendly_pickup = 1;
+        else if (field == "friend")
+            friendly_pickup = 0;
+    }
     else BOOL_OPTION(show_inventory_weights);
     else BOOL_OPTION(suppress_startup_errors);
     else BOOL_OPTION(clean_map);
@@ -1961,7 +1972,7 @@ void game_options::read_option_line(const std::string &str, bool runscript)
     {
         set_fire_order(field, plus_equal);
     }
-    
+
     BOOL_OPTION(random_pick);
     else BOOL_OPTION(remember_name);
 #ifndef SAVE_DIR_PATH
@@ -2247,7 +2258,7 @@ void game_options::read_option_line(const std::string &str, bool runscript)
             }
         }
     }
-    
+
     BOOL_OPTION(pickup_thrown);
     else BOOL_OPTION(pickup_dropped);
 #ifdef WIZARD
@@ -2411,7 +2422,7 @@ void game_options::read_option_line(const std::string &str, bool runscript)
     }
     else BOOL_OPTION(explore_greedy);
     else BOOL_OPTION(explore_improved);
-    
+
 	BOOL_OPTION(trap_prompt);
 	else if (key == "stash_tracking")
     {