diff options
| -rw-r--r-- | crawl-ref/docs/crawl_options.txt | 19 | ||||
| -rw-r--r-- | crawl-ref/docs/level-design.txt | 12 | ||||
| -rw-r--r-- | crawl-ref/init.txt | 1 | ||||
| -rw-r--r-- | crawl-ref/source/externs.h | 1 | ||||
| -rw-r--r-- | crawl-ref/source/initfile.cc | 12 |
5 files changed, 12 insertions, 33 deletions
diff --git a/crawl-ref/docs/crawl_options.txt b/crawl-ref/docs/crawl_options.txt index cb43035271..4ed508e3e8 100644 --- a/crawl-ref/docs/crawl_options.txt +++ b/crawl-ref/docs/crawl_options.txt @@ -41,9 +41,9 @@ The contents of this text are: scroll_margin 4-g Travel and Exploration. travel_delay, travel_avoid_terrain, - travel_exclude_radius2, travel_stop_message, - explore_greedy, explore_stop, runrest_ignore_message, - runrest_ignore_poison, trapwalk_safe_hp, tc_reachable, + travel_stop_message, explore_greedy, explore_stop, + runrest_ignore_message, runrest_ignore_poison, + trapwalk_safe_hp, tc_reachable, tc_dangerous, tc_excluded, tc_exclude_circle 4-h Stashes. stash_tracking, stash_filter @@ -597,12 +597,6 @@ travel_avoid_terrain = (shallow water | deep water) travel_avoid_terrain = shallow water, deep water will prevent travel or explore from going through any water. -travel_exclude_radius2 = 68 - The square of the radius around travel-excluded squares where travel - will refuse to go. Set to zero if you want to exclude single squares. - The default of 68 ensures that travel won't enter line-of-sight of any - dangerous thing at the travel-exclusion center. - travel_stop_message = <list of regexes> Travel will always stop upon hitpoint loss, confusion, stat drain, getting encumbered, catching sight of a non-friendly monster, and @@ -957,12 +951,7 @@ fire_order = launcher, dart / stone / dagger, spear, handaxe, club want it first, as it'll be ignored when you're not wielding a ranged weapon. The default is - fire_order = launcher, javelin / dart / stone - - To quickly experiment with a weapon-throwing character - e.g. to - make your Berserker actually use those three spears he carries around, - try a line similar to: - fire_order = launcher, dagger, spear, handaxe, stone, dart + fire_order = launcher, javelin / dart / stone / spear <See also pickup_thrown in A.4a.> diff --git a/crawl-ref/docs/level-design.txt b/crawl-ref/docs/level-design.txt index 33d52687c2..e97e8f858d 100644 --- a/crawl-ref/docs/level-design.txt +++ b/crawl-ref/docs/level-design.txt @@ -1143,11 +1143,11 @@ return_from_slime_pits, return_from_vaults, return_from_crypt, return_from_hall_of_blades, return_from_zot, return_from_temple, return_from_snake_pit, return_from_elven_halls, return_from_tomb, return_from_swamp, return_from_shoals, return_reserved_2, -return_reserved_3, return_reserved_4, enter_bazaar, exit_bazaar, -altar_zin, altar_shining_one, altar_kikubaaqudgha, altar_yredelemnul, -altar_xom, altar_vehumet, altar_okawaru, altar_makhleb, -altar_sif_muna, altar_trog, altar_nemelex_xobeh, altar_elyvilon, -altar_lugonu, altar_beogh, blue_fountain, dry_fountain_i, -sparkling_fountain, dry_fountain_ii, dry_fountain_iii, +return_reserved_3, return_reserved_4, enter_portal_vault, +exit_portal_vault, altar_zin, altar_shining_one, altar_kikubaaqudgha, +altar_yredelemnul, altar_xom, altar_vehumet, altar_okawaru, +altar_makhleb, altar_sif_muna, altar_trog, altar_nemelex_xobeh, +altar_elyvilon, altar_lugonu, altar_beogh, blue_fountain, +dry_fountain_i, sparkling_fountain, dry_fountain_ii, dry_fountain_iii, dry_fountain_iv, dry_fountain_v, dry_fountain_vi, dry_fountain_vii, dry_fountain_viii, permadry_fountain diff --git a/crawl-ref/init.txt b/crawl-ref/init.txt index 7cd544ee93..8bd040a0db 100644 --- a/crawl-ref/init.txt +++ b/crawl-ref/init.txt @@ -124,7 +124,6 @@ stab_brand = hi:blue # travel_colour = false # travel_delay = 20 # travel_avoid_terrain = shallow water -# travel_exclude_radius2 = 68 # # explore_greedy = true # explore_stop = items,stairs,shops,altars diff --git a/crawl-ref/source/externs.h b/crawl-ref/source/externs.h index 41b7b240c4..6f8bc22958 100644 --- a/crawl-ref/source/externs.h +++ b/crawl-ref/source/externs.h @@ -1703,7 +1703,6 @@ public: int travel_stair_cost; - int travel_exclude_radius2; // Square of the travel exclude radius bool show_waypoints; bool classic_item_colours; // Use old-style item colours diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index 60ba59ea53..34437eb81b 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -617,7 +617,6 @@ void game_options::reset_options() travel_colour = true; travel_delay = 20; travel_stair_cost = 500; - travel_exclude_radius2 = 68; // Sort only pickup menus by default. sort_menus.clear(); @@ -693,7 +692,7 @@ void game_options::reset_options() fire_items_start = 0; // start at slot 'a' // Clear fire_order and set up the defaults. - set_fire_order("launcher, javelin / dart / stone"); + set_fire_order("launcher, javelin / dart / stone / spear"); item_stack_summary_minimum = 5; @@ -1555,6 +1554,7 @@ void game_options::read_option_line(const std::string &str, bool runscript) type = '+'; break; + case '&': case 'x': // also corpses type = 'X'; @@ -2288,14 +2288,6 @@ void game_options::read_option_line(const std::string &str, bool runscript) { macro_meta_entry = read_bool(field, macro_meta_entry); } - else if (key == "travel_exclude_radius2") - { - travel_exclude_radius2 = atoi( field.c_str() ); - if (travel_exclude_radius2 < 0) - travel_exclude_radius2 = 0; - else if (travel_exclude_radius2 > 400) - travel_exclude_radius2 = 400; - } else if (key == "stop_travel" || key == "travel_stop_message") { std::vector<std::string> fragments = split_string(",", field); |