From 07eadf8e4cf3dd61fa66d194720143685ab84174 Mon Sep 17 00:00:00 2001 From: zelgadis Date: Tue, 2 Dec 2008 07:59:12 +0000 Subject: Merge r7717 and r7718: improvements to interrupted butchery behaviour. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@7719 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/docs/options_guide.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'crawl-ref/docs') diff --git a/crawl-ref/docs/options_guide.txt b/crawl-ref/docs/options_guide.txt index bbbde61be6..15760b7562 100644 --- a/crawl-ref/docs/options_guide.txt +++ b/crawl-ref/docs/options_guide.txt @@ -58,7 +58,7 @@ The contents of this text are: 4-i Command Enhancements. auto_list, easy_open, easy_unequip, easy_confirm, allow_self_target, easy_butcher, always_confirm_butcher, - swap_when_safe, easy_quit_item_prompts, easy_exit_menu, + prompt_for_swap, easy_quit_item_prompts, easy_exit_menu, sort_menus 4-j Message and Display Improvements. hp_warning, mp_warning, hp_colour, mp_colour, @@ -990,10 +990,12 @@ 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. -swap_when_safe = true +prompt_for_swap = true If both this and easy_butcher are true, then if an auto-switch - butchery is interrupted, the auto-switch will be reversed as - soon as you are safe again. + butchery is interrupted by a hostile monster, the game will + ask if you wish to switch back to your weapon. It will also + prompt you if after butchery is interupted you teleport or + change levels and find yourself near hostile monsters. easy_quit_item_prompts = true Setting this option to true allows the quitting of item listing -- cgit v1.2.3-54-g00ecf