Added two new options, rest_wait_both and chunks_autopickup, both defaulting

to false.  If rest_wait_both is true then resting will only stop when both
HP and MP are both fully restored, not when only one or the other is restored.
If chunks_autopickup is true then flesh chunks generated from butchering
will automatically be picked up (respecting the other autopickup settings).

My implementation of rest_wait_both has a few side effects.  I got rid
of check_hp() and check_mp() from the runrest class, since player AI
interruption code seems to be able to take care of that.  I also added
a rather kuldgey block_interruptions() so that the activity interrupts
code could use mpr() without going into infinite recursion because of
AI_MESSAGE interrutps.


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

1 files changed, 13 insertions, 0 deletions

diff --git a/crawl-ref/docs/options_guide.txt b/crawl-ref/docs/options_guide.txt
index adafbf6a2a..e7d6130b5e 100644
--- a/crawl-ref/docs/options_guide.txt
+++ b/crawl-ref/docs/options_guide.txt
@@ -812,6 +812,12 @@ trap_prompt = true
         stepping on a mechanical trap. Note that you'll always be prompted
         for non-mechanical traps.
 
+rest_wait_both = false
+        If rest_wait_both is set to true then resting will only stop
+        when both HP and MP are fully restored, not when either one of
+        them is restored.
+   
+
 4-h     Stashes.
 ----------------
 
@@ -890,6 +896,13 @@ always_confirm_butcher = false
         one corpse on the square. If there are multiple corpses on a 
         square, you will always be prompted, regardless of this option.
 
+chunks_autopickup = false
+        If true then butchered flesh will be autopickup'd right after
+        they're generated (and after switching back from the
+        butchering weapon to usual weapon, if necessary).  Respects
+        all of the autopickup options.  Requires '%' to be in the
+        autopickup line.
+
 easy_quit_item_prompts = true
         Setting this option to true allows the quitting of item listing 
         with Space (as well as Escape, which always works). These lists