Changed interrupted butchering behaviour as per Johanna's

suggestions/observations:

1) Get rid of option swap_when_safe and its behaviour.

2) If auto-swap butchery is interrupted by teleportation or chagning levels
   (banishment) then auto-swap back if there's no monsters nearby.

2b) Do the same if butchery is interrupted and then later a large position
    change happens.

3) If auto-swap butchery is interrupted by something like poison damage,
   if the butchery is resumed and finished then swap back.

4) If auto-swap butchery is interrupted by a monster, then if the
   new option prompt_for_swap is set the game will ask if you wish to
   swap back from your butchering tool.

4b) Do the same if butchery is interrupted and then later a large
    position change lands you near some hostile monsters.


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

1 files changed, 1 insertions, 1 deletions

diff --git a/crawl-ref/settings/init.txt b/crawl-ref/settings/init.txt
index 92ac56ee24..7c27112595 100644
--- a/crawl-ref/settings/init.txt
+++ b/crawl-ref/settings/init.txt
@@ -207,7 +207,7 @@ include = travel_stoppers.txt
 # allow_self_target = (yes | no | prompt)
 # easy_butcher = false
 # always_confirm_butcher = true
-# swap_when_safe         = false
+# prompt_for_swap        = false
 # easy_quit_item_prompts = false
 # easy_exit_menu         = false
 # sort_menus = pickup: true : basename, qualname, curse, qty