From 6434f5435b8f6864c6005efc746799293099bc57 Mon Sep 17 00:00:00 2001 From: Johanna Ploog Date: Sun, 13 Dec 2009 19:59:36 +0100 Subject: Use the trap_prompt option to decide whether disarming traps prompts you. --- crawl-ref/docs/options_guide.txt | 10 +++++----- crawl-ref/source/traps.cc | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'crawl-ref') diff --git a/crawl-ref/docs/options_guide.txt b/crawl-ref/docs/options_guide.txt index 840f632ced..d71c797c87 100644 --- a/crawl-ref/docs/options_guide.txt +++ b/crawl-ref/docs/options_guide.txt @@ -48,7 +48,7 @@ The contents of this text are: travel_delay, explore_delay, travel_avoid_terrain, explore_greedy, explore_stop, explore_stop_pickup_ignore, explore_improved, tc_reachable, tc_dangerous, tc_disconnected, - tc_excluded, tc_exclude_circle, travel_stop_message, + tc_excluded, tc_exclude_circle, travel_stop_message, runrest_ignore_message, runrest_ignore_poison, runrest_ignore_monster, trapwalk_safe_hp, trap_prompt, rest_wait_both, auto_exclude @@ -57,7 +57,7 @@ The contents of this text are: annotate_item_dropped 4-i Command Enhancements. auto_list, easy_open, easy_unequip, equip_unequip, - easy_confirm, allow_self_target, + easy_confirm, allow_self_target, easy_butcher, always_confirm_butcher, prefer_safe_chunks, easy_eat_chunks, easy_eat_gourmand, easy_eat_contaminated, prompt_for_swap, easy_quit_item_prompts, @@ -686,7 +686,7 @@ trap_item_brand = reverse symbol (^) and the trap symbol is branded. verbose_monster_pane = true - If set to false using the console version of Crawl (rather than the + If set to false using the console version of Crawl (rather than the tiles version), the pane listing the monsters in sight will give the older, less detailed information like "distracted" or "resting" rather than "fleeing", "sleeping", "unaware", etc. @@ -964,8 +964,8 @@ trapwalk_safe_hp = :, ... trap_prompt = true If trap_prompt is set to true Crawl will use the trapwalk_safe_hp values to decide whether the player should be prompted before - stepping on a mechanical trap. Note that you'll always be prompted - for non-mechanical traps. + stepping on or trying to disarm a mechanical trap. Note that you'll + always be prompted before stepping on non-mechanical traps. rest_wait_both = false If rest_wait_both is set to true then resting will only stop diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc index 0acb39b808..eebdd09865 100644 --- a/crawl-ref/source/traps.cc +++ b/crawl-ref/source/traps.cc @@ -780,7 +780,8 @@ void disarm_trap(const coord_def& where) #ifdef CLUA_BINDINGS // Prompt for any trap for which you might not survive setting it off. // (See trapwalk.lua) - if (!clua.callbooleanfn(false, "ch_cross_trap", "s", trap_name(where))) + if (Options.trap_prompt + && !clua.callbooleanfn(false, "ch_cross_trap", "s", trap_name(where))) { std::string prompt = make_stringf( "Really try disarming that %s?", -- cgit v1.2.3-54-g00ecf