From 38ebcee4627305ea124f2802fc9498e1acb97764 Mon Sep 17 00:00:00 2001 From: zelgadis Date: Fri, 30 May 2008 04:52:33 +0000 Subject: 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 --- crawl-ref/settings/init.txt | 3 +++ 1 file changed, 3 insertions(+) (limited to 'crawl-ref/settings') diff --git a/crawl-ref/settings/init.txt b/crawl-ref/settings/init.txt index 935c3eaac1..dd80b3a3c2 100644 --- a/crawl-ref/settings/init.txt +++ b/crawl-ref/settings/init.txt @@ -185,6 +185,8 @@ runrest_ignore_monster = butterfly:0 # trap_prompt = false trapwalk_safe_hp = dart:20,needle:15,arrow:35,bolt:45,spear:40,axe:45,blade:95 +#rest_wait_both = true + # The file (travel_stoppers.txt) contains a list of travel_stop_message # settings, with brief descriptions of what they do. include = travel_stoppers.txt @@ -203,6 +205,7 @@ include = travel_stoppers.txt # easy_confirm = (none | safe) # easy_butcher = false # always_confirm_butcher = true +# chunks_autopickup = true # easy_quit_item_prompts = false # easy_exit_menu = false # default_autoprayer = true -- cgit v1.2.3-54-g00ecf