autopickup_no_burden and show_turns make 0.1.7.

Updated documentation and init.txt.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.1.7@751 c06c8d41-db1a-0410-9941-cceddc491573

11 files changed, 261 insertions, 201 deletions

diff --git a/crawl-ref/CREDITS b/crawl-ref/CREDITS
index a8402607c2..a5b49e08fd 100644
--- a/crawl-ref/CREDITS
+++ b/crawl-ref/CREDITS
@@ -34,7 +34,7 @@ Ryan Kusnery
 Jukka Kuusisto
 Icy Lich
 Arien Malec
-Shawn Moore
+Shawn M Moore
 Eva Myers
 Erkki Nurmi
 nyra
diff --git a/crawl-ref/docs/crawl_options.txt b/crawl-ref/docs/crawl_options.txt
index 0b7bb2bae8..9ea6f4e9d5 100644
--- a/crawl-ref/docs/crawl_options.txt
+++ b/crawl-ref/docs/crawl_options.txt
@@ -11,19 +11,20 @@ The contents of this text are:
 		chaos_knight, death_knight, priest, 

 		race, class, random_pick

 2-  File System and Sound.

-                crawl_dir, save_dir, sound.

+                crawl_dir, save_dir, sound

 3-  Lua files.

 		lua_file,

 		base.lua, stash.lua, wield.lua, kills.lua, runrest.lua, 

 		gearset.lua, eat.lua, trapwalk.lua

 4-  Interface. 

 4-a	Dropping and Picking up.

-		autopickup, default_autopickup, safe_autopickup, safe_zero_exp,

-		pickup_thrown, pickup_dropped, assign_item_slot, ban_pickup, 

-		drop_mode, pickup_mode, drop_filter;

+		autopickup, default_autopickup, safe_autopickup,

+		autopickup_no_burden, safe_zero_exp, pickup_thrown,

+		pickup_dropped, assign_item_slot, ban_pickup, drop_mode,

+		pickup_mode, drop_filter;

 		lua: ch_autopickup (advanced autopickup exceptions)

 4-b	Targeting. 

-		target_zero_exp, target_wrap, target_oos, target_los_first,

+		target_zero_exp, target_oos, target_los_first,

 		confirm_self_target, default_fizzlecheck

 4-c	Passive Sightings (Detection and Rememberance).

 		detected_monster_colour, detected_item_colour, 

@@ -31,22 +32,24 @@ The contents of this text are:
 4-d	Branding (Item and Monster Highlighting).

 		heap_brand, friend_brand, stab_brand, may_stab_brand 

 4-e	Level Map Functions.

-		level_map_cursor_step, item_colour, show_waypoints

+		level_map_cursor_step, item_colour

 4-f	Travel and Exploration. 

-		travel_colour, travel_delay, travel_stair_cost, 

-                travel_avoid_terrain, travel_exclude_radius2,

-                travel_stop_message, explore_stop, runrest_ignore_message,

-                runrest_ignore_poison, trapwalk_safe_hp;

-		lua: ch_stop_run (ignoring monsters)

+		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,

+                tc_dangerous, tc_excluded, tc_exclude_circle; 

+                lua: ch_stop_run (ignoring monsters)

 4-g	Stashes.

 		stash_tracking, stash_filter

 4-h	Command Enhancements.

 		auto_list, lowercase_invocations, easy_open, easy_butcher, 

-		easy_armour, easy_confirm, easy_quit_item_lists, easy_exit_menu,

-		default_autoprayer, sort_menus

+		easy_unequip, easy_confirm, easy_quit_item_prompts, 

+                easy_exit_menu,	default_autoprayer, sort_menus

 4-i	Message and Display Improvements.

-		show_uncursed, hp_warning, always_greet, terse_hand, 

-		delay_message_clear, menu_colour

+		hp_warning, hp_colour, mp_colour, always_greet, terse_hand, 

+                delay_message_clear, menu_colour, increasing_skill_progress,

+                show_turns

 4-j	Missiles.

 		fire_items_start, fire_order

 4-k	Message Channels.

@@ -60,8 +63,7 @@ The contents of this text are:
 5-  Character Dump.

 5-a	Items and Kills.

 		kill_map, dump_kill_places, dump_item_origins, 

-		dump_item_origin_price, dump_message_count, dump_order,

-                verbose_dump 

+		dump_item_origin_price, dump_message_count, dump_order

 5-b	Notes.

 		use_notes, note_items, ood_interesting, note_hp_percent, 

 		note_skill_levels, note_skill_max, note_monsters, 

@@ -69,7 +71,7 @@ The contents of this text are:
 6-  Miscellaneous.

 6-a	All OS.

 		macro_meta_entry, wiz_mode, colours, char_set, cset_ascii,

-                cset_ibm, cset_dec, feature.

+                cset_ibm, cset_dec, feature

 6-b	DOS and Windows.

 		dos_use_background_intensity

 6-c     Unix

@@ -181,8 +183,8 @@ The currently available lua's are
   base.lua	-- needed for other lua scripts

   stash.lua	-- annotates the stash file for better searching (Ctrl-F)

 		   Searching for 'Long blades' will also turn up all weapons

-		   with the long blade skill. Also, you can now look for

-		   spellbooks ('book'), artifacts ('art'), ego items ('ego').	

+		   with the long blade skill. Also, you can now look for 

+                   spellbooks ('book'), artifacts ('\{art'), ego items ('ego').	

   wield.lua	-- shows more intelligent options when using 'w?'

   kills.lua	-- improves the Vanquished Creatures list in dump files; 

 		   currently gives three lists (Vanquished, Friendly, Others)

@@ -200,8 +202,8 @@ The currently available lua's are
 4-a	Picking up and Dropping.

 --------------------------------

 

-autopickup = $?!:"/

-	By default, the list is empty. The valid symbols are

+autopickup = $?!+"/%

+	The above is the default list. The valid symbols are

  	)	Weapons

 	(	Missiles

 	[	Armour

@@ -210,8 +212,8 @@ autopickup = $?!:"/
 	?	Scrolls

 	" or =  Jewellery

 	!	Potions

-	+ or :	Books

-	\ or |	Staves

+	+ 	Books

+	\ 	Staves

 	0	Orbs

 	}	Misc items

 	X	Corpses

@@ -231,19 +233,24 @@ safe_autopickup = true
 	monsters (or statues.) If safe_zero_exp is set (the default), zero-XP

 	monsters are considered friendly. 

 

+autopickup_no_burden = false

+	When set, autopickup will not pick up items which would increase

+        your burden status (from unencumbered to burdened, or from encumbered

+        to overloaded.)

+

 safe_zero_exp = true

 	If set, presence of only zero experience monsters (like plants) will

 	cause autopickups, even if safe_autopickup=true is set. This option 

 	also settles whether autoprayer considers such monsters risky.

 

-pickup_thrown = false

+pickup_thrown = true

 	Pickup_thrown=true causes autopickup to grab thrown/fired missiles. 

 	Many players use this because it eases ranged combat quite a bit. If 

 	following suit, be aware that there are situations when there is no 

 	time for picking up projectiles. Use Ctrl-A for switching off 

 	autopickup altogether in such cases or set safe_autopickup=true.

 

-pickup_dropped = true

+pickup_dropped = false

 	Pickup_dropped lets autopickup affect objects you've dropped. Set to 

 	false to block autopickup for dropped objects. This can be convenient.

 

@@ -268,43 +275,43 @@ ban_pickup = <regex>
 	  ban_pickup = forgetfulness, uselessness, noise, torment

 

 drop_mode = (multi | single)

-	Single is the classical behaviour (and default): after pressing another

-	key, that item will be dropped. Multi makes an inventory menu appear, 

-	allowing the selection of items to be dropped. (You can also switch to 

-	multidrop from the classic drop line using the '@' key).

-	Multidrops are highly convenient. Be aware of the fact that every 

-	single drop takes one turn. (This is different from picking up.) When

-	selecting multidrops, the top right corner will show the estimated 

-	number of turns.

-	The order in which items get dropped is always from top to bottom in 

-	the inventory listing.

+	Single is the classic behaviour after pressing another key, that item 

+        will be dropped. Multi (the default) makes an inventory menu appear, 

+        allowing the selection of items to be dropped. (You can also switch to 

+        multidrop from the classic drop line using the '@' key).

+

+	Multidrops are highly convenient. Be aware of the fact that every single

+        drop takes one turn. (This is different from picking up.) When selecting

+        multidrops, the top right corner shows the estimated number of turns.

+

+	The order in which items get dropped is from top to bottom in the 

+        inventory listing, but equipped items will be dropped last, and may be 

+        dropped out of order.

 

 pickup_mode = (multi | single | auto:X)

-        Single is the classical behaviour (and default): when picking up

-        items, you are prompted for them one by one. Multi makes a menu

-        appear, where you can choose which items to pick up. Note that

-        no matter how many items you choose, picking up will always take

-        one turn.

-        If pickup_mode is auto:X, where X is some number (for example,

-        auto:5), then pickup will give a menu if there are at least X

-        items on your square, and will prompt one by one otherwise.

+        Single is the classical behaviour (and default): when picking up items, 

+        you are prompted for them one by one. Multi makes a menu appear, where 

+        you can choose which items to pick up. Note that no matter how many 

+        items you choose, picking up will always take one turn.

+        If pickup_mode is auto:X, where X is some number (for example, auto:5), 

+        then pickup will give a menu if there are at least X items on your 

+        square, and will prompt one by one otherwise.

 

 drop_filter = <regex>

 	When selecting items using the global (de)select keys (',' or '-') in 

-	a multidrop listing, you can choose to apply a filter: only items 

-	whose names match the filter will be selected. The filter strings are 

-	regexes. For instance, to quickly select carrion and rotting chunks of 

-	meat, you could use:

+	a multidrop listing, you can choose to apply a filter: only items whose 

+        names match the filter will be selected. The filter strings are regexes. 

+        For instance, to quickly select carrion and rotting chunks of meat, you 

+        could use:

 	  drop_filter = skeleton, rotting, corpse

 	Other choices can come in handy as well, e.g. if you want to sacrifice

 	regularly all weapons except axes, use:

 	  drop_filter = axe, broadaxe

-	Note that if you use this option, you will lose the (de)select all 

-        keys. However, '*' inverts the current selection and so salvages this 

-	problem.

+	Note that if you use this option, you will lose the (de)select all keys. 

+        However, '*' inverts the current selection and so salvages this problem.

 	The default is empty.

 

-Using a Lua script, you can define a function "ch_autopickup" to select

+Using a Lua script, you can define a function "ch_autopickup" to select 

 additional items for autopickup. Let's say you want autopickup to only grab food

 if your character can eat it (let's say you're playing a kobold and you want to

 stop picking up vegetables). You could use the following (if '%' is not in the

@@ -333,14 +340,10 @@ end
 4-b	Targeting.

 -------------------

 

-target_zero_exp = true

+target_zero_exp = false

 	Set to false to disable targeting zero exp monsters (i.e. plants) 

 	in hostile targeting mode. This is usually convenient to do.

 

-target_wrap = true

-	Set to true if targeting should wrap around from last to first and 

-	vice versa.

-

 target_oos = true

         When cycling through items with 'x' look-around, setting target_oos to

         true allows you to jump the cursor to dungeon features (<> for stairs,

@@ -354,7 +357,7 @@ target_los_first = true
 	setting	target_los_first to true will force the cursor to squares in 

 	line-of-sight before going to squares outside LOS. Defaults to true.

 

-confirm_self_target = false

+confirm_self_target = true

 	Setting this to true will make Crawl ask for confirmation whenever

 	selecting the character as the target of a non-friendly-targeted spell 

 	(i.e., something other than haste, healing or invisibility.)

@@ -376,7 +379,7 @@ detected_item_colour = darkgrey
 	Items found by detect items will be given this colour, for example

 	  detected_item_colour = green

 

-colour_map = false

+colour_map = true

 	Colours out of sight map features on the playing screen.

 

 clean_map = false

@@ -432,44 +435,22 @@ may_stab_brand
 4-e	Level Map Functions.

 ----------------------------

 

-level_map_cursor_step = 10

+level_map_cursor_step = 7

 	How many squares the cursor moves on the level map when using 

 	Shift-direction or * direction.

 

-item_colour = false

+item_colour = true

 	Colours items on level-map.

 

-show_waypoints = true

-        If set to true (the default), waypoints will be numbered on the level

-        map, assuming that they're on a floor square with nothing on it.

-        Otherwise only a green dot will mark the square.

-

 

 4-f	Travel and Exploration.

 -------------------------------

 

-travel_colour = true

-        Option to turn off colouring the level-map with travel information. Few

-        will set this to false; it's only there for backwards compatibility.

-

 travel_delay = 20

         How long travel waits after each move (milliseconds). Depends on

         platform. Setting to -1 will jump to end of travel - you will not see

         the individual moves.

 

-travel_stair_cost = 500

-	travel_stair_cost determines how costly interlevel travel considers 

-	stairs.	With a high travel_stair_cost (such as the default of 500), 

-	interlevel travel will always choose routes with the minimum number of 

-	level changes possible.	If you set travel_stair_cost to a low value 

-	(such as the minimum of 1), interlevel travel will treat a staircase 

-	just like a normal move, and it may consequently choose routes that 

-	involve extra level transitions. This can be disconcerting in branches 

-	with elevator-type stair arrangements, particularly in the Lair, where 

-	there are typically long chains of elevator stairs, because travel will 

-	go out of its way to use the elevator and minimise total travel 

-	distance.

-	

 travel_avoid_terrain = (shallow water | deep water)

 	Prevent travel from routing through shallow water. By default, this 

 	option is commented out. For merfolk and/or characters with permanent 

@@ -503,6 +484,17 @@ travel_stop_message = <list of regexes>
              travel_stop_message = god:

         Multiple travel_stop_message lines can be used.

 

+explore_greedy = false

+        Greedy explore travels to items that are eligible for autopickup in

+        addition to exploring the level, but is otherwise identical to

+        regular explore. Greedy explore is only available with

+        stash_tracking = all (for any other value of stash_tracking, normal

+        explore behaviour is used). Greedy explore is also best with

+        pickup_dropped = false. Explore greed is disabled if you're

+        temporarily unable to pick up items (from uncontrolled levitation,

+        for instance). Default is false (no greedy explore) and using greedy

+        explore may slow down the performance.

+

 explore_stop = items,stairs,shops,altars

 	Explore will stop for one of these conditions. Whatever you set this 

 	option to, anything that stops travel will also stop explore. Multiple 

@@ -536,6 +528,17 @@ trapwalk_safe_hp = <trap_name>:<minimum_hp>, ...
         Defaults to none. For example,

               trapwalk_safe_hp = dart:15, needle:25, spear:50

 

+tc_reachable = blue

+tc_dangerous = cyan

+tc_excluded = lightmagenta

+tc_exclude_circle = red

+	The above four settle the colouring of the level map ('X'). They are

+	reachable: all squares reachable without problems (perhaps via stairs)

+	dangerous: squares which are only connected to your place via traps

+	excluded: the colour for the centre of travel exclusions (Ctrl-X)

+	excluded_circle: the colour for travel exclusions apart from centre 

+

+

 Using small scripts in init.txt, travel can get even more convenient.

 

 * Deciding whether monsters are worth stopping for:

@@ -564,50 +567,53 @@ end
 4-g	Stashes.

 ----------------

 

-stash_tracking = (explicit | dropped | all)

-        A stash is a heap of items tracked by crawl. You can search in your

+stash_tracking = (all | explicit | dropped)

+        A stash is a heap of items tracked by Crawl. You can search in your

         stashes with Ctrl-F. This options rules how stashes are generated.

-        When stash_tracking is set to 'explicit' (the default), you have to

-        explicitly tell the game what squares you want it to keep track of. You

-        do that by stepping onto the square containing your stash of goodies and

-        hitting Ctrl+S. The game will now keep track of what's on the square,

-        when you add and remove stuff from your stash. If you remove everything

-        from that square, the game will stop tracking the square altogether. You

-        can also erase a stash square with Ctrl-E.

+        When stash_tracking is set to 'all' (the default), the game marks any 

+	square where it sees any object as a stash. That gives you a 

+	comprehensive list of everything your character sees in the dungeon, 

+	but may slow the game down and use too much memory on older computers.

+

+	With 'explicit', you have to explicitly tell the game what squares you 

+	want it to keep track of. You do that by stepping onto the square 

+	containing your stash of goodies and hitting Ctrl+S. The game will now 

+	keep track of what's on the square, when you add and remove stuff from 

+	your stash. If you remove everything from that square, the game will 

+	stop tracking the square altogether. You can also erase a stash square 

+	with Ctrl-E.

 	

         When stash_tracking is set to 'dropped', any square where you drop 

 	something becomes a stash, and the game keeps track of all such 

-	squares.

+	squares. You can still use Ctrl-S and Ctrl-E as above.

 

-	When stash_tracking is set to 'all', the game marks any square where it 

-        sees any object as a stash. That gives you a comprehensive list of

-        everything your character sees in the dungeon, but may slow the game

-        down and use too much memory on older computers.

 

 4-h	Command Enhancements.

 -----------------------------

 

-auto_list = false

+auto_list = true

 	Change to true if you want to automatically list appropriate inventory 

 	items for commands like eat and read. This is like immediately hitting 

 	'?', and can be confusing to beginners because they won't get to see 

 	the prompts. This option does not apply to spell casting... Conjurers 

 	would probably find that really annoying. 

 

-lowercase_invocations = false

+lowercase_invocations = true

 	Set this option to true if you prefer to have invocations on 'a'-'e' 

-	instead of the traditional 'A'-'E' (which is the default). Setting to 

-	true save invocations an annoying shift keypress.

+	instead of the older 'A'-'E'. Note that you can change the letters of

+        invocations (and other abilites) with the '=' command.

 

 easy_open = false

 	Open doors by moving on to them. Highly convenient. Note that travel 

 	and exploration will automatically open doors depending on this option.

 

-easy_butcher = false

-	If true, auto-switch to uncursed short blade for butchery.

+easy_butcher = true

+	If true, auto-switch to uncursed short blade for butchery. For such 

+	tools any special messages are ignored. If false, you have to wield the 

+	tool manually.

 

-easy_armour = true

-	Allows auto removal of armour when dropping it. 

+easy_unequip = true

+	Allows auto removal of armour and jewellery when dropping it. 

 

 easy_confirm = (none | safe | all)

 	Make confirmation questions easier to answer:

@@ -618,11 +624,11 @@ easy_confirm = (none | safe | all)
 	which can result in accidentally answering yes to questions; it is 

 	suggested that you use a value of 'none' or 'safe'

 

-easy_quit_item_lists = false

+easy_quit_item_prompts = true

 	Setting this option to true allows the quitting of item listing with 

-	space as well as escape. These lists are essentially all of those that 

-	are requesting an inventory item and accept '?' and '*'.

-	The identify list will never easy quit. The default is false.

+	Space (as well as Escape, which always works). These lists are 

+	essentially all of those that are requesting an inventory item and 

+	accept '?' and '*'. The identify list will never easy quit. 

 

 easy_exit_menu = true

 	In multidrop (and pickup) menus, paging past the end will drop out of

@@ -642,44 +648,35 @@ default_autoprayer = false
 	Also note the option safe_zero_exp (see 4-a) decides whether zero 

 	experience monsters (like plants) are considered hostile.

 

-sort_menus = auto:5

+sort_menus = (true | false | auto:X)

         When set to true, items are sorted by description in inventory and

-        pickup menus. When set to false (default), items are ordered by

-        equipment slot. When set to a number - using a syntax of the form

-        sort_menus = auto:5 - items are sorted by their description if

-        the total number of items in that category is at least that

-        number; in the default case, having 4 kinds of potions would not

-        sort them, but having 5 would.

+        pickup menus. When set to false, items are ordered by equipment slot. 

+	When set to a number - using a syntax of the form 

+         sort_menus = auto:5 (the default) 

+        - items are sorted by their description if the total number of items in 

+        that category is at least that number; in the default case, having 4 

+        kinds of potions would not sort them, but having 5 would.

 	

 

 4-i	Messages and Display Enhancements.

 ------------------------------------------

 

-show_uncursed = true

-	This option adds the text "uncursed" to items where the curse status is 

-        relevent and known. Does not bother to show "uncursed" on items that are

-        fully identified (showing pluses), since that wound be redundant and 

-	waste space. Should be set to true.

-

-hp_warning = 25

+hp_warning = 10

 	hp_warning gives "* * * LOW HITPOINT WARNING * * *" on the danger 

         channel when the player takens damage and their hitpoints are less than

-        this percentage of their maximum (use 0 to turn off these messages). It 

-	is recommended to use

-	  hp_warning = 55

+        this percentage of their maximum (use 0 to turn off these messages).

 

 terse_hand = true

 	Set this to false to have the "in hand" description on the main screen 

 	the same as the inventory. The default setting of true will give the 

-	newer more terse description that should fit the limited space better 

-	(but will be harder for new players to understand).

+	newer more terse description that should fit the limited space better. 

 

 delay_message_clear = false

         Setting this option to true will delay the clearing of messages until

         the message space is full (default is false which results in clearing

         between player actions).

 

-always_greet = false

+always_greet = true

 	always_greet will give the race/class and god messages everytime the 

 	game is started. 

 

@@ -689,16 +686,29 @@ menu_colour = <colour>:<regex>
 	statements in a list, or also several menu_colour lines. When using

 	several menu_colour lines, the colour of the _first_ matching regex 

 	is applied. For a list of colours, check the colour option in 6-a.

+

 	To colour worn stuff and highlight cursed items, take

 	  menu_colour = lightred: cursed.*(worn|neck|hand|weapon)

 	  menu_colour = green:(worn|neck|hand|weapon)

 	  menu_colour = red: cursed

+

 	If you frequently die because you forget to use emergency items, try

 	  menu_colour = cyan:(potions? of heal wounds|teleportation)

 	  menu_colour = lightcyan:(blinking|wand of (fire|cold|draining))

+

 	To quickly check what potions were trashed by a mummy curse, use

 	  menu_colour = lightred:potions? of (degeneration|decay)

 

+increasing_skill_progress = true

+        This affects the appearance of the skills screen ('m'). With the 

+	default true, the progress for getting ew levels is shown with

+        increasing percentiles; so that immediately after level up it will

+        read (0%). With false, you get the old behaviour which counts backwards

+        from 10.

+

+show_turns = true

+        This option controls whether the turn counter (of turns elapsed) is

+        displayed in the main view.

 

 4-j	Missiles.

 -----------------

@@ -789,6 +799,10 @@ autoinscribe = <regex>:<inscription>
 	  autoinscribe = royal jell:=g

 	  autoinscribe = honeycomb:=g

 

+        Another use of autoinscription is making sure that you don't lose

+        charges of important wands accidentally, as in

+          autoinscribe = wand of healing:!z

+

 

 4-m	Macro related Options.

 ------------------------------

@@ -846,7 +860,7 @@ dump_item_origin_price = 100
 	Item origins are dumped if the price of the item is greater than or 

 	equal to this amount. Set this to -1 to prevent selection by price.

 

-dump_message_count = 4

+dump_message_count = 7

 	The number of last messages to be displayed in character dump files. 

 

 dump_order  = header,stats,misc,notes,inventory,skills

@@ -854,10 +868,6 @@ dump_order += spells,mutations,messages,screenshot,kills
         Controls the order of sections in the dump. You can use multiple

         dump_order lines - all lines but the first must use dump_order +=

 

-verbose_dump = false

-	verbose dump causes less important item details to appear in character 

-	dumps.

-

 

 5-b	Notes.

 --------------

diff --git a/crawl-ref/init.txt b/crawl-ref/init.txt
index f96c0e8dfb..0d1c9f5d67 100644
--- a/crawl-ref/init.txt
+++ b/crawl-ref/init.txt
@@ -28,6 +28,8 @@
 # Note that all boolean options (i.e. values of 'true' or 'false') have
 # their non-default value commented out. You can toggle these by just
 # uncommenting.
+# Options with several values, e.g stash_tracking = (all | explicit | dropped),
+# usually have the first value as default.
 
 ##### 1- Starting Screen ############################################
 #
@@ -62,39 +64,34 @@ lua_file = lua/trapwalk.lua
 #
 ##### 4-a	Picking up and Dropping ###############
 #	
-autopickup = $?!:"/%
+# autopickup = $?!+"/%
 # default_autopickup = false
-# safe_autopickup = true
+# safe_autopickup = false
+# autopickup_no_burden = true
 # safe_zero_exp = false
-# pickup_thrown = true
-# pickup_dropped = false
+# pickup_thrown = false
+# pickup_dropped = true
 # assign_item_slot = backward
 #
-ban_pickup = degeneration,decay,confusion,potions? of slowing
-ban_pickup = potions? of strong poison,potions? of poison
-ban_pickup = inaccuracy
-ban_pickup = scrolls? of paper,immolation,curse armor,curse weapon
-ban_pickup = forgetfulness,uselessness,noise,torment
+# ban_pickup = scrolls? of random uselessness
 #
-drop_mode = multi
-pickup_mode = auto:5
+# drop_mode = (multi | single)
+# pickup_mode = (single | multi | auto:5)
 # drop_filter = skeleton, rotting, corpse
 
 ##### 4-b	Targetting ############################
 #
 # target_zero_exp = false
-# target_wrap = false
 # target_oos = false
 # target_los_first = false
-# confirm_self_target = true
+# confirm_self_target = false
 # default_fizzlecheck = true
 
 ##### 4-c	Passive Sightings #####################
 #
 detected_monster_colour = lightred
 detected_item_colour = green
-remembered_monster_colour = darkgrey
-# colour_map = true
+# colour_map = false
 # clean_map = true
 
 ##### 4-d	Branding ##############################
@@ -106,65 +103,68 @@ stab_brand = hi:blue
 
 ##### 4-e	Level Map Functions ###################
 #
-level_map_cursor_step = 10
-item_colour = true
-# show_waypoints = false
+# level_map_cursor_step = 7
+# item_colour = false
 
 ##### 4-f	Travel and Exploration #################
 #
 # travel_colour = false
-travel_delay = 20
-travel_stair_cost = 500
+# travel_delay = 10
 # travel_avoid_terrain = shallow water
-travel_exclude_radius2 = 68
-#
-# stop_travel = Something appears
-# stop_travel = god:wrath finds you
+# travel_exclude_radius2 = 68
 #
+# explore_greedy = yes
 # explore_stop = items,stairs,shops,altars
+
+# tc_reachable = blue
+# tc_dangerous = cyan
+# tc_excluded = lightmagenta
+# tc_exclude_circle = red
+
+# The following options are not default. Uncommenting activates them.
 #
+# stop_travel = Something appears
+# stop_travel = god:wrath finds you
 # runrest_ignore_message = prayer ends
-#
 # runrest_ignore_message = You feel.*sick
 # runrest_ignore_poison = 4:100
-
 # trapwalk_safe_hp = dart:15, needle:25, spear:50
 
 ##### 4-g	Stashes ###############################
 #
-# stash_tracking = (explicit | dropped | all)
+# stash_tracking = (all | explicit | dropped)
 # stash_filter = 14, 4:21
 
 ##### 4-h	Command Enhancements ##################
 #
-# auto_list = true
-# lowercase_invocations = true
-# easy_open = true
-# easy_butcher = true
-# easy_armour = false
+# auto_list = false
+# lowercase_invocations = false
+# easy_open = false
+# easy_butcher = false
+# easy_unequip = false
 # easy_confirm = (none | safe | all)
-# easy_quit_item_lists = true
+# easy_quit_item_prompts = false
 # easy_exit_menu = true
 # default_autoprayer = true
-# sort_menus = true
+# sort_menus = (auto:5 | true | false)
 
 ##### 4-i	Messages and Display Enhancements #####
 #
-# show_uncursed = false
-hp_warning = 25
+# hp_warning = 10
 # terse_hand = false
 # delay_message_clear = true
-# always_greet = true
-# increasing_skill_progress = true
+# always_greet = false
+# increasing_skill_progress = false
+# show_turns = false
 #
-# menu_colour = lightred: cursed.*(worn|neck|hand|weapon)\)
-# menu_colour = green:(worn|neck|hand|weapon)\)
-# menu_colour = red: cursed
+menu_colour = lightred: cursed.*(worn|neck|hand|weapon)\)
+menu_colour = green:(worn|neck|hand|weapon)\)
+menu_colour = red: cursed
 
 ##### 4-j	Firing Commands #######################
 #
-fire_items_start = a
-fire_order = launcher, dart, stone, dagger, spear, handaxe, club
+# fire_items_start = a
+# fire_order = launcher, dart, stone, dagger, spear, handaxe, club
 
 ##### 4-k	Channels ##############################
 #
@@ -187,17 +187,16 @@ fire_order = launcher, dart, stone, dagger, spear, handaxe, club
 # kill_map = friend:you, other:you
 # dump_kill_places = (single | all | none)
 # dump_item_origins = all,artifacts,ego_arm,ego_weap,jewellery,runes
-dump_item_origin_price = 100
-dump_message_count = 4
+# dump_item_origin_price = 100
+# dump_message_count = 7
 # dump_order  = header,stats,misc,notes,inventory,skills
 # dump_order += spells,mutations,messages,screenshot,kills
-# verbose_dump = true
 
 ##### 5-b	Notes #################################
 #
 # use_notes = false
-note_items = rod,book,rune
-ood_interesting = 8
+# note_items = rod,book,rune
+# ood_interesting = 8
 # note_hp_percent = 5
 # note_skill_levels = 1,5,10,15,27
 # note_skill_max = true
@@ -211,7 +210,10 @@ ood_interesting = 8
 # colour.yellow    = brown
 #
 # use_ascii = ascii
-wiz_mode = no
+# wiz_mode = no
+#
+# See crawl_options.txt for the options
+# char_set, cset_ascii, cset_ibm, cset_dec, cset_any, feature
 
 ##### 6-b	DOS and Windows #######################
 #
diff --git a/crawl-ref/source/chardump.cc b/crawl-ref/source/chardump.cc
index d8b35ff94b..0f867a19d8 100644
--- a/crawl-ref/source/chardump.cc
+++ b/crawl-ref/source/chardump.cc
@@ -176,6 +176,8 @@ static void sdump_burden(const std::string &, std::string &text)
     case BS_ENCUMBERED:
         text += "You are encumbered.\n";
         break;
+    default:
+        break;
     }
 }
 
diff --git a/crawl-ref/source/externs.h b/crawl-ref/source/externs.h
index b4c499064e..30001609f7 100644
--- a/crawl-ref/source/externs.h
+++ b/crawl-ref/source/externs.h
@@ -425,7 +425,7 @@ struct player
   FixedVector< item_def, ENDOFPACK > inv;
 
   int burden;
-  char burden_state;
+  burden_state_type burden_state;
   FixedVector<unsigned char, 25> spells;
   char spell_no;
   unsigned char char_direction;          //
@@ -738,6 +738,8 @@ public:
     bool        autoprayer_on;
     bool        fizzlecheck_on;
 
+    bool        show_turns;     // Show turns used in HUD.
+
     long        autopickups;    // items to autopickup
     bool        verbose_dump;   // make character dumps contain more detail
     bool        detailed_stat_dump; // add detailed stat and resist dump
@@ -751,6 +753,7 @@ public:
     bool        increasing_skill_progress; // skills go from 0-10 or 10-0
     bool        confirm_self_target; // require confirmation before selftarget
     bool        safe_autopickup; // don't autopickup when monsters visible
+    bool        autopickup_no_burden; // don't autopickup if it changes burden
     bool        note_skill_max; // take note when skills reach new max
     bool        note_all_spells; // take note when learning any spell
     bool        use_notes;	// take (and dump) notes
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index 243c3a2544..6240529351 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -524,6 +524,8 @@ void game_options::reset_options()
     autoprayer_on = false;
     fizzlecheck_on = false;
 
+    show_turns = true;
+
     prev_race = 0;
     prev_cls  = 0;
     prev_ck   = GOD_NO_GOD;
@@ -568,7 +570,7 @@ void game_options::reset_options()
     note_all_spells        = false;
     note_hp_percent        = 0;
     ood_interesting        = 8;
-    terse_hand             = false;
+    terse_hand             = true;
     increasing_skill_progress = true;
 
     // [ds] Grumble grumble.
@@ -1495,6 +1497,10 @@ void game_options::read_option_line(const std::string &str, bool runscript)
         save_dir = field;
 #endif
     }
+    else if (key == "show_turns")
+    {
+        show_turns = read_bool( field, show_turns );
+    }
     else if (key == "hp_warning")
     {
         hp_warning = atoi( field.c_str() );
@@ -1570,11 +1576,15 @@ void game_options::read_option_line(const std::string &str, bool runscript)
     }
     else if (key == "confirm_self_target")
     {
-	confirm_self_target = read_bool( field, confirm_self_target );
+        confirm_self_target = read_bool( field, confirm_self_target );
     }
     else if (key == "safe_autopickup")
     {
-	safe_autopickup = read_bool( field, safe_autopickup );
+        safe_autopickup = read_bool( field, safe_autopickup );
+    }
+    else if (key == "autopickup_no_burden")
+    {
+        autopickup_no_burden = read_bool( field, autopickup_no_burden );
     }
     else if (key == "use_notes")
     {
@@ -1598,7 +1608,8 @@ void game_options::read_option_line(const std::string &str, bool runscript)
     }
     else if (key == "increasing_skill_progress")
     {
-        increasing_skill_progress = read_bool( field, increasing_skill_progress );
+        increasing_skill_progress =
+            read_bool( field, increasing_skill_progress );
     }
     else if (key == "flush")
     {
diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc
index a37e4a812a..abed66ac49 100644
--- a/crawl-ref/source/items.cc
+++ b/crawl-ref/source/items.cc
@@ -2973,6 +2973,29 @@ static void autopickup(void)
             if (!(mitm[o].flags & ISFLAG_THROWN))
                 unthrown++;
 
+            int num_to_take = mitm[o].quantity;
+            if ( Options.autopickup_no_burden && item_mass(mitm[o]) != 0)
+            {
+                int num_can_take =
+                    (carrying_capacity(you.burden_state) - you.burden) /
+                    item_mass(mitm[o]);
+
+                if ( num_can_take < num_to_take )
+                {
+                    if (!tried_pickup)
+                        mpr("You can't pick everything up without burdening "
+                            "yourself.");
+                    tried_pickup = true;
+                    num_to_take = num_can_take;
+                }
+
+                if ( num_can_take == 0 )
+                {
+                    o = next;
+                    continue;
+                }
+            }
+
             mitm[o].flags &= ~(ISFLAG_THROWN | ISFLAG_DROPPED);
 
             result = move_item_to_player( o, mitm[o].quantity);
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index 96a13a7352..816d816804 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -61,8 +61,12 @@ void update_turn_count()
 {
     // Don't update turn counter when running/resting/traveling to
     // prevent pointless screen updates.
-    if (you.running > 0 || (you.running < 0 && Options.travel_delay == -1))
+    if (!Options.show_turns
+        || you.running > 0
+        || (you.running < 0 && Options.travel_delay == -1))
+    {
         return;
+    }
 
     // FIXME: Create some kind of layout manager class so we can
     // templatise the heads-up display layout and stop hardcoding
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 7f1b699ef8..14f1efde70 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -2027,10 +2027,15 @@ unsigned char player_sust_abil(bool calc_unid)
     return sa;
 }                               // end player_sust_abil()
 
-int carrying_capacity(void)
+int carrying_capacity( burden_state_type bs )
 {
-    // Originally: 1000 + you.strength * 200 + ( you.levitation ? 1000 : 0 )
-    return (3500 + (you.strength * 100) + (player_is_levitating() ? 1000 : 0));
+    int cap = 3500 + (you.strength * 100) + (player_is_levitating() ? 1000 : 0);
+    if ( bs == BS_UNENCUMBERED )
+        return (cap * 5) / 6;
+    else if ( bs == BS_ENCUMBERED )
+        return (cap * 11) / 12;
+    else
+        return cap;
 }
 
 int burden_change(void)
@@ -2039,8 +2044,6 @@ int burden_change(void)
 
     you.burden = 0;
 
-    int max_carried = carrying_capacity();
-
     if (you.duration[DUR_STONEMAIL])
         you.burden += 800;
 
@@ -2066,8 +2069,7 @@ int burden_change(void)
     set_redraw_status( REDRAW_BURDEN );
 
     // changed the burdened levels to match the change to max_carried
-    if (you.burden < (max_carried * 5) / 6)
-    // (you.burden < max_carried - 1000)
+    if (you.burden < carrying_capacity(BS_UNENCUMBERED))
     {
         you.burden_state = BS_UNENCUMBERED;
 
@@ -2075,8 +2077,7 @@ int burden_change(void)
         if (old_burdenstate != you.burden_state)
             mpr("Your possessions no longer seem quite so burdensome.");
     }
-    else if (you.burden < (max_carried * 11) / 12)
-    // (you.burden < max_carried - 500)
+    else if (you.burden < carrying_capacity(BS_ENCUMBERED))
     {
         you.burden_state = BS_ENCUMBERED;
 
diff --git a/crawl-ref/source/player.h b/crawl-ref/source/player.h
index 8cfc165ee2..1093b51f4b 100644
--- a/crawl-ref/source/player.h
+++ b/crawl-ref/source/player.h
@@ -86,7 +86,7 @@ int burden_change(void);
 /* ***********************************************************************
  * called from: items - misc
  * *********************************************************************** */
-int carrying_capacity(void);
+int carrying_capacity( burden_state_type bs = BS_OVERLOADED );
 
 
 /* ***********************************************************************
diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc
index f5a1f109a3..a246d51f7a 100644
--- a/crawl-ref/source/view.cc
+++ b/crawl-ref/source/view.cc
@@ -1682,7 +1682,11 @@ void draw_border(void)
     gotoxy(40,  8); cprintf("Int:");
     gotoxy(40,  9); cprintf("Dex:");
     gotoxy(40, 10); cprintf("Gold:");
-    gotoxy(55, 10); cprintf("Turn:");
+    if (Options.show_turns)
+    {
+        gotoxy(55, 10);
+        cprintf("Turn:");
+    }
     gotoxy(40, 11); cprintf("Experience:");
     gotoxy(40, 12); cprintf("Level");
 }                               // end draw_border()