r6764@kamatari (orig r2130): dshaligram | 2007-09-17 15:30:46 -0400

 Trunk is now 0.4.
 r6766@kamatari (orig r2132):  dshaligram | 2007-09-17 16:21:17 -0400
 Merged newgame fixes and compile fixes for dgamelaunch patches to trunk.
 r6769@kamatari (orig r2135):  j-p-e-g | 2007-09-18 09:37:01 -0400
 Hopefully repeat my previous changes for trunk:
 documentation and index/offset fix.
 
 r6770@kamatari (orig r2136):  j-p-e-g | 2007-09-18 11:54:14 -0400
 Applying modified (by me) mutation patches of dolorous',
 mostly clean-up and output changes.
 
 * More consistent output for Centaurs and chars with 
   hoof mutation (patch 1794849).
 
 * Remove "deterioration" (ghouls type) from % screen. d. is
   right in that this was misleading. (1795995)
 
 * Change "no piety" message for Yredelemnul. Okay, this is
   not mutation-related and of no consequence to boot (Yred
   doesn't accept offerings), but why not? (1796199)
 
 * Mutation output now lists unremovable mutations first
   (innate and demonspawn).
 
 It's all fairly small stuff, but is it small enough to 
 branch? I think yes, but asking doesn't hurt, right?
 
 r6771@kamatari (orig r2137):  zelgadis | 2007-09-18 21:19:56 -0400
 Added new commands "re-do previous command" (bound to `) and "repeat
 next command" (bound to 0).  Though this is just an interface change,
 it changes code in the core input processing function (input() in acr.cc),
 and also messes around with the input buffer, so it could probably do
 with more testing before merging it into the 0.3 branch.
 
 r6773@kamatari (orig r2139):  zelgadis | 2007-09-18 22:01:24 -0400
 "newly seen" vs "already seen" context was missing for see-monster activity
 interrupt data.
 
 r6775@kamatari (orig r2141):  zelgadis | 2007-09-18 23:10:09 -0400
 Removed detailed_hunger option, the hunger states near starving, very
 hungry and very full are now always displayed.
 
 r6777@kamatari (orig r2143):  zelgadis | 2007-09-19 00:18:53 -0400
 If wizard mode is on when going through a portal to a bazaar, Crawl will
 ask the user for the name of a bazaar map to load (minus the "bazaar_"
 at the front of the name); escape or enter can be pressed to get a random
 map.
 
 Adds new wizard command 'P', to create portal-vault-portals to arbitrary
 destinations (though any desitnation but "bazaar" will currently cause
 an assertion when the portal is entered).
 
 Adds new map marker class map_wiz_props_marker, which can be used by
 wizard commands to create a map marker with abritrary properties.
 
 r6779@kamatari (orig r2145):  zelgadis | 2007-09-19 02:42:50 -0400
 Introduces three new wall types, translucent versions of the normal
 rock wall, stone wall and permanent rock wall.  These are for use in
 vaults, and are never randomly generated.  Magically translucent
 versions of the normal wall types are used, rather than glass, so we
 don't have to figure out how glass would react to things like digging
 and Shatter, but can re-use the code for the normal wall types.
 
 I've tried to fix all the places where the old code assumes that any
 square which is visible to the player has no walls between it and the
 player, but I've probably missed lots; this will require a lot of play
 testing before its ready for non-developers.
 
 viewwindow() now has two calls to losight(), the second one
 determining what squares would be visible if all translucent walls
 were made transparent, so that there's a quick way to see if there's
 any translucent walls between the player and a square.  This second
 call to losight() doesn't cause any noticeable slowdown for me, but it
 might on an older system.
 
 Other than viewwindow() making a second call to losight(), there
 shouldn't be any changes to game-play or game-logic if there aren't any
 translucent walls around.
 
 The wizard blinking command (&b) has been changed so that it ignores
 all normal restrictions except for needing to see the target square and
 not landing on monsters; if the player lands on a wall square it's
 changed to floor.  Wizard blinking also doesn't increase magical
 contamination.
 
 r6780@kamatari (orig r2146):  zelgadis | 2007-09-19 04:55:18 -0400
 This change moves the logic for when a level or branch prohibits
 teleport control from the C++ code into the vault .des files.  This is
 done with the additions of two things:
 
 * Changeable, persistent per-level and per-branch flags which affect
   game play.
 
 * Dungeon events for the killing of monsters, picking up of objects
   and changing of features.
 
 The current level and branch flags are for teleport control
 prevention, making a level unmappable (like the Abyss or a Labyrinth),
 and preventing magic mapping from working (like the Abyss or a
 Labyrinth).
 
 Some related changes:
 
 * The new .des header KMASK allows for dungeon grid masks like
   no_monster_gen to be applied to specific symbols rather than the
   entire vault.
 
 * If the wizard mapping command (&{) is used in a place which is
   unmappable, it will ask if you wish to force the area to be mappable
   (so you can see what an entire Labyrinth or Abyss level looks like
   without having to hack the source).
 
 * A new wizard-mode level-map command, 'T', will teleport the player
   to wherever the cursor is pointing.
 
 r6781@kamatari (orig r2147):  j-p-e-g | 2007-09-19 13:58:35 -0400
 Highlighting species in aptitudes list, and added the 
 "." command to help screen. I've added some "\n" to make
 it look nice (on Windows) but it's looking differently
 on Linux. *shrugs*
 
 r6783@kamatari (orig r2149):  j-p-e-g | 2007-09-19 18:54:50 -0400
 Fixing a number of bugs on throwing nets, so it's all in 
 all a net improvement. ;)
 
 I'm reusing item.plus2 as a marker for trapping 
 monsters or not. AFAIK, missiles don't need those, 
 and it makes stacking so much easier.
 
 Gladiators start with Throwing skill 1, except for
 Kobolds (don't get a net) who get an additional level
 at Dodging.
 
 r6784@kamatari (orig r2150):  zelgadis | 2007-09-19 18:56:46 -0400
 Input buffer needs to be flushed if the first iteration of command
 repetition is canceled.
 
 Repetitions of searching and go-nowhere weren't being interrupted.
 
 Wasn't generating activity interrupts for AI_FULL_MP and AI_FULL_HP.
 
 r6786@kamatari (orig r2152):  haranp | 2007-09-19 19:28:26 -0400
 Fix for memory corruption when reading savefiles.
 
 r6787@kamatari (orig r2153):  zelgadis | 2007-09-19 20:02:32 -0400
 Fixed =/== typo.
 
 r6788@kamatari (orig r2154):  zelgadis | 2007-09-20 00:18:24 -0400
 Mutations 'green marks' was being miscounted as mutation #64, rather than
 the correct #65, leading to there being the wrong number of entries in
 the mutation tables.
 
 r6789@kamatari (orig r2155):  zelgadis | 2007-09-20 00:26:28 -0400
 A number of "gain mutation" debug command improvements:
 
 * The name given is now a simple name (fast, clever, etc) matching
   the enumeration name, rather than the description of when you
   first get the mutation.
 
 * The name can be "any" to get a random mutation, or "xom" to get a
   random Xom mutation.
 
 * If the player has the resist mutation mutation, the command asks
   if you want to get rid of it.
 
 * You can force a mutation to happen, so that it will happen in spite
   of mutation resistance mutation, mutation resistance amulet,
   already being covered in too many scales, and so on.
 
 Other wizard command improvements:
 
 * The dismiss all (genocide) command can now take a regex of the monsters
   to dismiss, rather than dismissing all of them.
 
 * The heal and super-heal wizard commands now never make you engorged.
 
 r6791@kamatari (orig r2157):  zelgadis | 2007-09-20 01:47:52 -0400
 Was clearing the list of remembered get_input_line() lines at the
 wrong time.
 
 r6792@kamatari (orig r2158):  zelgadis | 2007-09-20 02:27:28 -0400
 Inscribing an item with "=p" will, for Nemelexites, prevent just that item
 from being sacrificed; "!p" still prevents an entire stack of items from
 being sacrificed, and the prompt message for "!p" is now clearer on that.
 Also, explictly marked stashes are never sacrificed by Nemelxites.
 
 
 r6794@kamatari (orig r2160):  zelgadis | 2007-09-20 03:46:53 -0400
 more() should be skipped during any type of key replay, not just command
 repetition.
 
 r6795@kamatari (orig r2161):  haranp | 2007-09-20 06:11:58 -0400
 Delays now give their startup messages when they start, rather than
 when they are pushed onto the queue. Fixes 1797499.
 
 r6798@kamatari (orig r2164):  j-p-e-g | 2007-09-20 07:51:22 -0400
 Previous commit applied to trunk:
 * cleanup of weird_colour()
 * hooves mutation one level only
 * fixes for vampire food level checks
 * Xom gifts interrupt travel
 
 r6799@kamatari (orig r2165):  j-p-e-g | 2007-09-20 12:58:33 -0400
 Cleanup of manual (patches 1798238, 1798239) and of claw 
 mutation as well as the breathe poison one (patches
 1795977, 1797293). All patches by dolorous.
 
 r6801@kamatari (orig r2167):  zelgadis | 2007-09-20 20:27:59 -0400
 No longer id ego weapons of monsters simply because the monster is already
 wielding them.  However, if a monster wields or unwields a weapon and
 it gives a message like "The dagger is surrounded by flames!", that
 still id's the ego.
 
 Also, wand zaps by visible monster now update the wand's zap count.
 
 r6807@kamatari (orig r2169):  zelgadis | 2007-09-20 22:24:18 -0400
 Oops, my "dismiss monsters by regex" change didn't take into account that
 the "debug atuoexplore" debug command uses the dismiss-monsters command.
 
 r6839@kamatari (orig r2170):  zelgadis | 2007-09-21 01:11:51 -0400
 Can now search the description database by name (keyword) with '?/'.
 Not adding to 0.3-branch yet in case it needs some tweaks.
 
 r6840@kamatari (orig r2171):  zelgadis | 2007-09-21 05:18:24 -0400
 Oops, '\' is the glyph for staves on Windows.
 
 r6841@kamatari (orig r2172):  j-p-e-g | 2007-09-21 05:21:44 -0400
 Add past tense to visited branches output, and a
 few corrections.
 
 r6843@kamatari (orig r2174):  j-p-e-g | 2007-09-21 11:16:15 -0400
 Fixed note taking (NOTE_HP_CHANGE) for invisible monsters
 (bug 1786776) and in general (wasn't working).
 
 Also tweaked tutorial message on burning spellbooks
 (Bug 1799350).
 
 r6846@kamatari (orig r2177):  zelgadis | 2007-09-21 22:48:12 -0400
 If there are multiple matches to the "?/" describe command, then
 they will be displayed in a menu, which the user can select from.
 Menu entries for monsters will be given the same color as the monster,
 with the monster's symbol added to the end of the string.
 
 Entering a single character as input to the "?/" describe command lists
 all monsters with that display symbol.
 
 Monsters sharing the same display symbol can now have the same string
 appended or prepended to their description (implemented to make the
 "?/" command have to deal with less special cases).  Currently only
 used by nagas with __N_suffix.  Has the side-effect advantage that
 the naga subspicies description and the "attractive/repulsive"
 description goes before the big block of quoted text, rather than after
 it.
 
 r6847@kamatari (orig r2178):  zelgadis | 2007-09-21 23:12:44 -0400
 Oops, forgot about database case insensitivity again.
 
 r6848@kamatari (orig r2179):  zelgadis | 2007-09-22 05:21:32 -0400
 Added additional optional parameter to item_def::name(), ignore_flags,
 which will cause the name to be constructed as if those item flags
 had been unset.
 
 Give an auxiliary cause of death for a stat going below 1.  (Death
 by stat loss is already pretty rare, and death by stat loss with
 confusion as to what caused the stat loss must be *really* rare, but still,
 if you were confused about what caused the stat loss that lead to death,
 that'd be pretty frustrating)
 
 ouch() is now called from within modify_stat() and lose_stat() right after
 the stat is lowered, rather than when the stat is updated on the screen.
 This incidentally fixes the minor annoyance of saying "no" to stat loss
 death in wizard mode, only to be asked if you want to die every time
 the screen is updated until you fix having a non-positive stat.
 
 r6849@kamatari (orig r2180):  dshaligram | 2007-09-22 10:25:42 -0400
 Implemented SQLite fronts for dbm_firstkey and dbm_nextkey to fix trunk build
 on Windows.
 r6850@kamatari (orig r2181):  dshaligram | 2007-09-22 10:31:36 -0400
 Fix MinGW complaining about possible uninitialised variables.
 r6851@kamatari (orig r2182):  dshaligram | 2007-09-22 11:34:04 -0400
 Removed overly spammy visual messages (specifically, monsters lashing their
 tails).
 
 Fixed butcher weapon-swap crash (David).
 r6853@kamatari (orig r2184):  zelgadis | 2007-09-23 03:15:24 -0400
 Nemelex gift deck changes:
 
 * Changed pure deck distribution formula.  All consumable items go
   towards decks of wonder, books and jewellery go towards decks of
   dungeon, and corpses are now valued proportionally to their weight,
   rather than every corpse being of equal value.
 
 * The chance of getting rare and legendary decks increases with
   piety.
 
 * The card countdown (which must be 0 to get a new gift deck) sometimes
   decreases when drawing a card, with the chance increasing with the
   number of piety points gained from drawing the card.
 
 All of this is very tentative and subject to change upon the results of
 play testing.
 
 Also, some more optional debugging messages have been added, which can
 be activated in a more fine grained manner than DEBUG_DIAGNOSTICS
 (DEBUG_CARDS, DEBUG_GIFTS, etc).
 
 r6854@kamatari (orig r2185):  zelgadis | 2007-09-24 01:04:58 -0400
 ?/ now asks if you want to describe a monster, spell, or feature, and
 filters out matches if they aren't of the desired type.
 
 If there's more than one match, after selecting a match to look at,
 exiting from the description will return you to the menu, rather than
 to the dungeon.
 
 If you've asked for monsters, you can toggle sorting of the menu
 between alphabetical and by aproximated monster toughness (this probably
 still needs some work, since it seems to say that ordinary worms are
 tougher than brain worms).
 
 Only the monster symbol is coloured when showing a menu of monsters
 to describe.
 
 r6855@kamatari (orig r2186):  zelgadis | 2007-09-24 06:19:40 -0400
 Added some missing cases to various mons_foo_level() functions.
 
 Added mon-pick related function mons_global_level(), which returns
 a reasonable level value for monsters independant of the place 
 of the monster, primarily useful for comparing the levels of two
 monsters which might never show up in the same place (in which
 case mons_level() is useless).
 
 r6856@kamatari (orig r2187):  j-p-e-g | 2007-09-24 10:11:22 -0400
 A few simple fixes.
 
 * Add zero level invocations to Trog and Ely's religion screens
 * Demonspawn get 0-2 additional damage for demonic weapons
   (similar to MD + dwarven weapons)
 * Darts and Throwing don't crosstrain anymore
 * Don't offer "inscribe items" text during tutorial.
 * Cleanup and minor fixes of tutorial
 
 r6858@kamatari (orig r2189):  nlanza | 2007-09-24 12:55:50 -0400
 Clean up a printf format string to placate the extra-special pickiness
 of gcc 4 in newer OS X.
 
 r6859@kamatari (orig r2190):  nlanza | 2007-09-24 12:57:57 -0400
 Add state.cc to the Xcode build and massage the compile settings to deal
 with the fact that yacc on 10.5 emits code that the compiler's default
 settings don't like -- signed/unsigned comparisons, specifically.
 
 r6862@kamatari (orig r2193):  dshaligram | 2007-09-24 15:15:51 -0400
 Beogh butcher fix for trunk.
 r6863@kamatari (orig r2194):  dshaligram | 2007-09-24 15:25:34 -0400
 Refix ?/ error message format to handle 64-bit and 32-bit size_t without
 compiler warning noises.
 r6864@kamatari (orig r2195):  dshaligram | 2007-09-24 16:08:10 -0400
 Added DGL_STARTUP_PREFS_BY_NAME to store new character options by username
 for dgamelaunch.
 
 Dropped ice statue hitpoints to compensate for their immunity to
 disintegration.
 r6866@kamatari (orig r2197):  dshaligram | 2007-09-24 16:14:30 -0400
 Fixed combat messages for out of sight draining attacks (jarpiain).
 r6868@kamatari (orig r2199):  zelgadis | 2007-09-25 04:00:46 -0400
 Make formatted_string::parse_string() split up the string into chunks of
 999 characters or less so that formatted_string::cprintf()'s character
 buffer doesn't overflow.
 
 r6869@kamatari (orig r2200):  zelgadis | 2007-09-25 04:25:40 -0400
 Slight improvement to repeating mutation command.
 
 r6871@kamatari (orig r2202):  zelgadis | 2007-09-25 07:07:01 -0400
 Prevent Crawl from going into an infinite loop during newgame setup
 if an incompatible class/race combination is specified in the init file.
 
 r6873@kamatari (orig r2204):  dshaligram | 2007-09-25 14:12:02 -0400
 * Fixed Vault:8 level being generated with no rune (cbus).
 * Dropped odds of statue vault.
 * Take note of messages received in dgamelaunch chat.
 * crawl -vscores, etc. should not attempt to create save/morgue directories
   (Marc).
 * Changed wording of "Foo wielding bar comes into view" to
   "Foo comes into view. It is wielding bar.".
 * Suppress curse status display of monster items.
 * TSO worshippers are no longer warned when stabbing monsters if TSO doesn't
   object to stabbing those monsters.
 * Wand zap status is now {zapped: N} instead of {zapped N times} to reduce
   verbosity.
 r6875@kamatari (orig r2206):  haranp | 2007-09-25 19:28:04 -0400
 Restore original correct text to MR artifacts.
 
 r6876@kamatari (orig r2207):  dshaligram | 2007-09-26 07:27:16 -0400
 Removed hard tabs.
 
 Corrected sling bullet description.
 
 Targeting forward wrap-around was broken, fixed.
 
 Dropped damage bonus for kenku clawed-kick.
 
 Don't show {tried} for equipped items.
 
 Removed Elyvilon's protection from high-damage hits even when not praying.
 r6880@kamatari (orig r2211):  dshaligram | 2007-09-26 07:54:26 -0400
 Minivault balancer fix for trunk.
 r6881@kamatari (orig r2212):  dshaligram | 2007-09-26 08:25:04 -0400
 Fixed missile preservation numbers for sling bullets and javelins.
 r6882@kamatari (orig r2213):  dshaligram | 2007-09-26 08:36:31 -0400
 All vaults are now "uniq" (one-use-per-game) by default. Vaults that want
 to be reused must be tagged "allow_dup".
 r6884@kamatari (orig r2215):  dshaligram | 2007-09-26 09:50:10 -0400
 Dropped bolt of inaccuracy accuracy. It's probably still be too accurate, given
 the nerf to monster EV vs beams.
 
 Bumped inaccuracy to level 3.
 r6886@kamatari (orig r2217):  dshaligram | 2007-09-26 15:43:53 -0400
 Adjusted piety costs for Beogh smiting and Okawaru Haste (cbus/syllogism).
 
 Reduced monster spawn ramp-up in Vestibule.
 r6888@kamatari (orig r2219):  dshaligram | 2007-09-26 16:33:14 -0400
 Fixed Beogh being angered by killing a non-orc friendly with a beam (cbus).
 r6890@kamatari (orig r2221):  j-p-e-g | 2007-09-26 17:45:01 -0400
 Fix wording for translucent rock walls (1798932).
 Change freshness calculation for chunk sorting: all chunks
 now sorted oldest to freshest, listing rotten last for 
 non-Saprovores.
 Small comment fixes.
 
 r6892@kamatari (orig r2223):  zelgadis | 2007-09-26 20:26:01 -0400
 Allow Pandemonium lesser demon vaults and labyrinth entrances to
 be duplicated within a game.
 
 r6894@kamatari (orig r2225):  dshaligram | 2007-09-27 02:51:32 -0400
 Added allow_dup to all bazaar and lab maps.
 r6896@kamatari (orig r2227):  dshaligram | 2007-09-27 06:59:19 -0400
 Bumped piety cost for brothers-in-arms and greater healing.
 
 Added COLOUR: directive to maps to allow custom colouring of features
 by glyph, and tweaked the strawberry fields variants to use it.
 r6897@kamatari (orig r2228):  dshaligram | 2007-09-27 07:10:13 -0400
 Updated level-design.txt for COLOUR.
 
 Fixed map_lines::clear() not cleaning colour overlay. 
 r6898@kamatari (orig r2229):  dshaligram | 2007-09-27 07:12:22 -0400
 Updated canned level-compiler.
 r6900@kamatari (orig r2231):  dshaligram | 2007-09-27 08:33:29 -0400
 remember_name was broken, fixed.
 
 Colour overlays were not being rotated/mirrored, fixed.
 r6902@kamatari (orig r2233):  dshaligram | 2007-09-28 03:58:50 -0400
 Fixed issues with substring matches of item names (spears being generated for
 pears) in maps (David). The change also means that item names have to be 
 specified in full in map definitions.
 r6903@kamatari (orig r2234):  zelgadis | 2007-09-28 04:18:33 -0400
 Beogh won't smite the player if his idol was destroyed by a monster.
 
 r6904@kamatari (orig r2235):  zelgadis | 2007-09-28 04:27:29 -0400
 crawl_state now keeps track of whether or not the current code is being
 executed because of a god's actions, and if so which god (with "actions"
 not including god-supplied invocations).  Currently only used to prevent
 Xom from being amused/stimulated by his own actions.
 
 r6905@kamatari (orig r2236):  j-p-e-g | 2007-09-28 07:59:18 -0400
 Adding allow_dup tags to several vaults. (David)
 
 r6908@kamatari (orig r2239):  j-p-e-g | 2007-09-28 09:01:04 -0400
 Whoops, I'd forgotten to change something in a minivault.
 
 r6910@kamatari (orig r2241):  dshaligram | 2007-09-28 09:58:05 -0400
 Added a sanity check for followers to prevent frozen monsters (cbus). Still need to figure out why monsters are getting marked as followers when they shouldn't.
 r6912@kamatari (orig r2243):  dshaligram | 2007-09-28 10:15:06 -0400
 Reintroduced Slime:6 royal-jelly-death marker.
 [1804113] Corrected spell order in Practical Magic.
 r6914@kamatari (orig r2245):  dshaligram | 2007-09-28 14:43:36 -0400
 Better messages for explore finding multiple non-stacking items (say "two leather armours" instead of "leather armour and leather armour").
 r6916@kamatari (orig r2247):  dshaligram | 2007-09-28 15:42:10 -0400
 [1800818] Fixed broken follower tagging for bazaars.
 r6918@kamatari (orig r2249):  j-p-e-g | 2007-09-28 18:40:28 -0400
 Updating description for "freshness" sorting option.
 
 r6920@kamatari (orig r2251):  dshaligram | 2007-09-28 18:58:41 -0400
 Fixed possible crash when placing monster bands. Also reworked the mapgen stats to give more detailed information.
 r6922@kamatari (orig r2253):  j-p-e-g | 2007-09-29 08:40:55 -0400
 Berserking monsters are now noisy with a noise level that
 befits their shout_type.
 
 r6924@kamatari (orig r2255):  j-p-e-g | 2007-09-29 09:33:37 -0400
 Changing the piety gain messages to be threefold for no piety,
 little piety (1) and lots of piety (> 1). Currently, piety is
 raised by at most 1 at a point so the last one is currently
 unused. Eventually, we'll want to include that one, though.
 (Although I've got trouble imagining a piety gain greater 
 than, say, 2 or 3.)
 
 r6937@kamatari (orig r2256):  zelgadis | 2007-09-30 01:56:13 -0400
 This commit breaks save file compatability.
 
 Lots of new things that amuse/stimulate Xom, and a few things which
 don't amuse him as much anymore.  Among the new things is a corpse
 turning into a skeleton while butchering it; if this is too harsh to
 do just for Xom's amusement (previously turning into a skeleton while
 butchering was an ignored case and still produced chunks of flesh) it
 can be changed back.  Also, if a Xom worshiper draws the Blank card,
 Xom makes it act like a Xom card, since a plain old Blank card is boring.
 
 Keep track of which branch the Orb is in, if the player isn't carrying
 it.
 
 Keep track of how/why the player ended up in a particular level type
 (Abyss, Pan, etc).
 
 Changed most "a distortion effect" cause strings for distortion caused
 tranlsocation miscast effects to something more specific.
 
 Added new wizard commands 'C' to curse or uncruse an item, and 'Ctrl-A'
 to re-generate the Abyss.
 
 r6938@kamatari (orig r2257):  zelgadis | 2007-09-30 02:50:01 -0400
 A few improvements to banished() and entry cause tracking.
 
 r6939@kamatari (orig r2258):  j-p-e-g | 2007-09-30 09:11:01 -0400
 Add redraw_hp to the "Elixir" card.
 Hide Xom piety on status screen.
 
 r6941@kamatari (orig r2260):  j-p-e-g | 2007-09-30 09:18:19 -0400
 Monster centaurs now sometimes (rarely) wear barding.
 The chances are lower even than for naga as I believe that 
 centaurs occur more frequently than naga. As I've been
 completely disregarding the Snake Pit I could be entirely
 wrong.
 
 r6943@kamatari (orig r2262):  j-p-e-g | 2007-09-30 11:45:57 -0400
 Trog's bookburning invocation only costs a turn and food 
 if it's actually successful.
 
 r6944@kamatari (orig r2263):  j-p-e-g | 2007-09-30 11:53:09 -0400
 Introducing shortcut for searching the current level as
 requested in FR 1801705.
 Also adding feedback when auto-travel fails to kick in.
 And trying to get out of a net no longer stops travel, only
 being caught in one does (FR 1800821).
 
 r6947@kamatari (orig r2266):  dshaligram | 2007-09-30 13:18:31 -0400
 Fixed regex escapes for "." stash search.
 r6956@kamatari (orig r2268):  dshaligram | 2007-09-30 14:37:21 -0400
 [1804879] Fixed bad time-elapsed events being generated for new levels, also fixes labyrinths/bazaars not being generated correctly.
 r6959@kamatari (orig r2271):  zelgadis | 2007-09-30 20:09:26 -0400
 The Shuffle card now kills the player if any stats are lowered below
 1.
 
 r6960@kamatari (orig r2272):  zelgadis | 2007-10-01 00:05:20 -0400
 Fix wizard mode cheating-death from losing experience or levels when
 level 1, so you won't end up as a level 0 character with 0 HP.
 
 r6961@kamatari (orig r2273):  zelgadis | 2007-10-01 00:29:44 -0400
 Better interface for creating runes and decks.
 
 r6962@kamatari (orig r2274):  zelgadis | 2007-10-01 02:01:58 -0400
 Tweak command can now accept hexadecimal values.
 
 r6963@kamatari (orig r2275):  dshaligram | 2007-10-01 02:09:00 -0400
 Fixed broken 64-bit compile.
 r6964@kamatari (orig r2276):  zelgadis | 2007-10-01 02:50:07 -0400
 Some paranoia checks for buggy decks when evoking or stacking them.
 If the deck has no cards left yet still exists, the deck is destroyed
 and Nemelexites are awarded a brownie point for using up a deck.  If a
 stacked deck has holes in it, the holes are removed.  If a stacked
 deck has buggy cards in it, they are discarded.  If a deck had
 problems with it, the user is asked if s/he is sure about using the
 (now fixed) deck, and no turns are used if the answer is "no".
 
 r6965@kamatari (orig r2277):  zelgadis | 2007-10-01 03:27:21 -0400
 Oops, had some code placed after a "return" statement; why didn't the
 compiler catch that?
 
 r6966@kamatari (orig r2278):  j-p-e-g | 2007-10-01 03:51:02 -0400
 Overhaul trapping net escape functions.
 
 With the help of several factors (such as size, wielded weapon
 or stats) the game decides whether you should try to destroy the
 net to come free, or try to slip out of it. The same calculation
 also influences how long this will take.
 
 r6968@kamatari (orig r2280):  dshaligram | 2007-10-01 04:50:12 -0400
 Restore vampiric healing for killing blows (jarpiain).
 r6970@kamatari (orig r2282):  dshaligram | 2007-10-01 06:29:29 -0400
 [1804917] Berserkers no longer get Polearms skill for their throwing spears, since the spears use only Throwing.
 r6971@kamatari (orig r2283):  dshaligram | 2007-10-01 06:44:11 -0400
 Fixed vampiric healing on death using raw damage instead of actual damage, which produced super-healing for stabbing (jarpiain).
 r6973@kamatari (orig r2285):  zelgadis | 2007-10-01 08:06:58 -0400
 The player now dies if the Focus card causes any stat to go below 1.
 
 r6974@kamatari (orig r2286):  zelgadis | 2007-10-01 08:31:37 -0400
 Oops, check_buggy_deck() was itself buggy; fixed.
 
 Also, fixed the deck stacking interface so that all available cards
 are always visible, rather than sometimes being split across a '-more-'
 prompt.
 
 r6975@kamatari (orig r2287):  dshaligram | 2007-10-01 14:27:31 -0400
 Wanderers could start with items equipped in the wrong slots, fixed.
 r6976@kamatari (orig r2288):  dshaligram | 2007-10-01 15:18:06 -0400
 Fixed bad species name (eg: deep elves with the bows title) in dump because of reuse of static buffers (Iaido).
 r6978@kamatari (orig r2290):  dshaligram | 2007-10-01 17:14:06 -0400
 Restored 0.2's character combinations, fixed crash when killing a monster using Pain.
 r6991@kamatari (orig r2293):  zelgadis | 2007-10-02 02:52:08 -0400
 Added floor_special and floor_reserved to dngn_feature_names[], to make
 the array match up with the enums.
 
 Don't describe the weapon with which an unseen monster is attacking.
 
 Added methods can_see() and visible_to() to the actor, player and
 monster classes, which take care of calling mons_player_visible(),
 player_monster_visible(), mons_monster_visible() and mons_near().
 
 Re-arranged the first 12 dungeon_feature_type enumerations so that
 similar features are contiguous (i.e., closed door and secret door are
 next to each other), and added DNGN_MAXOPAQUE (one less than
 DNGN_MINSEE), DNGN_MINWALL and DNGN_MAXWALL.
 
 r6992@kamatari (orig r2294):  zelgadis | 2007-10-02 03:25:05 -0400
 Xom is stimulated/amused if a harmful beam ricochets and hits the originator
 of the beam.
 
 r6993@kamatari (orig r2295):  dshaligram | 2007-10-02 06:57:45 -0400
 Fixed segfault in explore discovery reporting (syllogism).
 r6995@kamatari (orig r2297):  dshaligram | 2007-10-02 07:15:12 -0400
 Fixed elven fighters getting Armour skill instead of Dodging. Fixed deep elf bow aptitude (Anym).
 r6997@kamatari (orig r2299):  dshaligram | 2007-10-02 07:38:37 -0400
 Replaced inc_god_acting/dec_god_acting pairing with god_acting objects.
 r6998@kamatari (orig r2300):  zelgadis | 2007-10-02 18:40:40 -0400
 Made Xom be smarter about being amused at losing/missing runes, and
 made Xom also be amused at runes being destroyed.  Related changes:
 
 * Keep track of which items have ever been held by the player with
   ISFLAG_BEEN_IN_INV.
 
 * item_was_destroyed() is called when an item is destroyed (as in
   dropped in lava, not destroy_item() being called), and item_was_lost()
   is called if the item was lost (i.e., being left behind in the Abyss).
 
 * Keeps track of the number of runes that the character has collected,
   and how many have been left in the Halls of Zot.
 
 r6999@kamatari (orig r2301):  zelgadis | 2007-10-02 21:39:08 -0400
 Added svn properties svn:keywords and svn:eol-style to files which were
 missing them.
 
 r7000@kamatari (orig r2302):  zelgadis | 2007-10-03 00:09:08 -0400
 Runes and the Orb now have elemental (flickering/shifting) colours.
 
 r7001@kamatari (orig r2303):  zelgadis | 2007-10-03 00:19:40 -0400
 Don't assert-fail due to a buggy rune being in the player's inventory
 when constructing a score-file entry, since checks for buggy runes are
 done elsewhere in the game.
 
 r7002@kamatari (orig r2304):  dshaligram | 2007-10-03 02:40:26 -0400
 Updated colour names in initfile.cc for the new elemental colours.
 r7003@kamatari (orig r2305):  dshaligram | 2007-10-03 02:43:35 -0400
 Make element_cols static.
 r7006@kamatari (orig r2308):  dshaligram | 2007-10-03 03:30:57 -0400
 Corrected INSTALL.
 r7008@kamatari (orig r2310):  j-p-e-g | 2007-10-03 15:20:02 -0400
 Outsourcing weapon noises to speak.txt, and adding more
 messages.
 
 r7009@kamatari (orig r2311):  dshaligram | 2007-10-03 16:21:40 -0400
 Cleaned up newgame item creation code, fixed MuFi starting with bad items as shields (cbus), and corrected Rupert's description.
 r7010@kamatari (orig r2312):  dshaligram | 2007-10-03 16:25:34 -0400
 Fixed equipment slot assignment check.
 r7012@kamatari (orig r2314):  zelgadis | 2007-10-04 01:05:42 -0400
 Moved all of the bazaar specific logic/code to dat/bazaar (or turned the
 code into Lua utility functions which can be reused by things other than
 bazaars).  Related changes:
 
 * Portal vault entrances now work if they have destinations ("dst" property)
   besides "bazaar" (though it still causes an assert if no matchng
   maps for the destination can be found).
 
 * The floor and rock colour for a level are generated once and then stored
   in the save file, rather than being constantly regenerated (which means
   that bazaar floor colours are now truly random, rather than being tied
   to the depth of the bazaar entrance).
 
 * The floor and rock colour for a portal vault (or for any level containing
   any vault) can be set with ROCKCOL and FLOORCOL (which currently only
   accepts a single colour, unlike COLOUR); there are also Lua functions for
   querying and setting the colours.
 
 * Each portal vault level_type_name can have an associated Lua callback
   which is called when level generation is complete; it can be used for
   things like stair fixup.
 
 I also moved the Halls of Zot rock/floor colour special casing to the
 dat/zot.des file, since it was easy once ROCKCOL and FLOORCOL had been
 implemented.
 
 r7013@kamatari (orig r2315):  zelgadis | 2007-10-04 01:07:33 -0400
 ROCKCOL and FLOORCOL changes for the prebuilt parser/lexer.
 
 r7014@kamatari (orig r2316):  zelgadis | 2007-10-04 02:01:30 -0400
 Quiet a compile warning.
 
 r7015@kamatari (orig r2317):  zelgadis | 2007-10-04 02:36:16 -0400
 Wizard commands should never use up a turn.
 
 r7016@kamatari (orig r2318):  dshaligram | 2007-10-04 03:01:16 -0400
 Makhleb accepts undead and demon kills once again, matching b26 behaviour (Iaido).
 r7017@kamatari (orig r2319):  dshaligram | 2007-10-04 03:20:11 -0400
 [1804502] Fixed undead pretending to resist dispel undead.
 r7019@kamatari (orig r2321):  zelgadis | 2007-10-04 04:53:33 -0400
 Lots more keywords, plus hiliting for numbers, ranges, weights and
 slashes.
 
 r7020@kamatari (orig r2322):  dshaligram | 2007-10-04 06:28:54 -0400
 Unicode support tweak: always set locale to what's specified in UNICODE_LOCALE, defaulting to en_US.UTF-8.
 r7022@kamatari (orig r2324):  j-p-e-g | 2007-10-04 08:52:55 -0400
 Another cleanup of dungeon features. Adding general markers
 for first branch/last branch and first altar/last altar that
 should hopefully make adding new ones easier.
 
 r7023@kamatari (orig r2325):  j-p-e-g | 2007-10-04 08:58:23 -0400
 Add documentation for weapon noises and update comments.
 Also update information about Throwing crosstraining.
 
 r7028@kamatari (orig r2328):  zelgadis | 2007-10-05 02:10:49 -0400
 Shaft traps (trap doors) [1792195] and level annotation [1769009]
 added, with the shaft traps changed as per comments on SF; shafts
 aren't randomly generated yet, so this doesn't change gameplay.
 Changed DNGN_TRAP_III to DNGN_TRAP_NATURAL, of which trap type the
 shaft traps are the only current member.
 
 r7029@kamatari (orig r2329):  zelgadis | 2007-10-05 03:05:22 -0400
 Oops, was calling dgn_set_floor_colours() in wrong place, leading to some
 levels getting the wrong colours.  Also, make dgn_set_colours_from_monsters()
 be paranoid about improprely set up env.mons_alloc[].
 
 r7030@kamatari (orig r2330):  zelgadis | 2007-10-05 03:31:05 -0400
 init_pandemonium() needs to re-do dgn_set_colours_from_monsters(),
 since it is called after level generation is complete.
 
 r7031@kamatari (orig r2331):  zelgadis | 2007-10-05 04:27:09 -0400
 Randomly generate shaft traps.
 
 r7032@kamatari (orig r2332):  dshaligram | 2007-10-05 04:42:04 -0400
 Corrected grammar on a couple of Singing Sword messages, fixed crash when placing vaults with &L (bobbens).
 r7033@kamatari (orig r2333):  dshaligram | 2007-10-05 04:53:32 -0400
 Removed unnecessary conditional that may cause issues building Lua.
 r7034@kamatari (orig r2334):  dshaligram | 2007-10-05 05:10:34 -0400
 Fixed segfault when using &Z (bobbens).
 r7035@kamatari (orig r2335):  dshaligram | 2007-10-05 06:58:57 -0400
 Refix &Z crash-fix, which didn't actually fix the crash. :P
 r7037@kamatari (orig r2337):  zelgadis | 2007-10-05 18:20:15 -0400
 Remove trap-door-like logic from shaft traps, since shafts are just
 supposed to be holes hidden by debris.
 
 r7038@kamatari (orig r2338):  nlanza | 2007-10-05 23:32:13 -0400
 Add xom.h to the project file so everything's listed.
 
 r7039@kamatari (orig r2339):  nlanza | 2007-10-05 23:33:03 -0400
 Uninitialized variable fixes.
 
 r7040@kamatari (orig r2340):  dshaligram | 2007-10-06 07:47:47 -0400
 Fixed off-by-one error when complaining about oversized maps (bobbens).
 r7041@kamatari (orig r2341):  dshaligram | 2007-10-06 09:04:13 -0400
 First steps toward removing the need for 6-deep rock-wall padding around dungeon maps. This is likely to be buggy for a while.
 r7042@kamatari (orig r2342):  dshaligram | 2007-10-06 14:42:21 -0400
 Added new maps by bobbens, moved Crypt and Tomb maps to crypt.des.
 r7044@kamatari (orig r2344):  dshaligram | 2007-10-06 16:35:15 -0400
 Discarding unused .des files.
 r7046@kamatari (orig r2346):  dshaligram | 2007-10-06 17:30:10 -0400
 Assume KFEAT: ? = floor if we've seen a KITEM: or KMONS: for the same glyph.
 r7047@kamatari (orig r2347):  dshaligram | 2007-10-06 17:32:35 -0400
 Updated Vault:8 map for new Kfoo behaviour.
 r7048@kamatari (orig r2348):  dshaligram | 2007-10-06 17:41:33 -0400
 Fixed bad hp/mp gain calculation when gaining multiple experience levels with one kill (jarpiain).
 r7050@kamatari (orig r2350):  dshaligram | 2007-10-07 06:37:49 -0400
 Adjust monster generation difficulty to be closer to 0.2 averages, but with more variance. Early monster difficulty should be less brutal now.
 r7052@kamatari (orig r2352):  dshaligram | 2007-10-07 07:32:10 -0400
 Increased max monsters to 350, breaks saves, may be buggy. Incremented save major version.
 r7053@kamatari (orig r2353):  dshaligram | 2007-10-07 07:53:26 -0400
 Allow overriding monster colours in map specs using col:<newcolour>.
 r7054@kamatari (orig r2354):  dshaligram | 2007-10-07 07:58:59 -0400
 Fixed bad comparison with string literal (bobbens).
 r7055@kamatari (orig r2355):  dshaligram | 2007-10-07 09:32:22 -0400
 Clear dropped+thrown flags on corpse when converting it to chunks (V-Napkin). Also announce rod identification when it self-ids [1808821].
 r7057@kamatari (orig r2357):  dshaligram | 2007-10-07 09:41:42 -0400
 [1808631] PCs in statue-form should not be able to scramble out of deep water.
 r7058@kamatari (orig r2358):  dshaligram | 2007-10-07 09:45:05 -0400
 [1808624] Dropping part of a stack of wielded items should not unwield the whole stack.
 r7059@kamatari (orig r2359):  dshaligram | 2007-10-07 09:51:03 -0400
 [1808560] Staff of power unwield was not removing max mp bonus, fixed.
 r7060@kamatari (orig r2360):  dshaligram | 2007-10-07 09:55:48 -0400
 [1808372] Clip menu item labels at terminal width.
 r7061@kamatari (orig r2361):  dshaligram | 2007-10-07 10:07:44 -0400
 Fixed bad magic points calculation when levelling up with a worn item of magical power (V-Napkin).
 r7062@kamatari (orig r2362):  dshaligram | 2007-10-07 10:12:54 -0400
 [1808952] Smiting monsters did not wake them up, fixed.
 r7064@kamatari (orig r2364):  dshaligram | 2007-10-07 10:43:42 -0400
 [1808964] Holy Word wakes and annoys affected monsters.
 r7065@kamatari (orig r2365):  dshaligram | 2007-10-07 10:55:57 -0400
 [1808968] Using the weapons of the demon lords in combat angers TSO and Zin.
 r7067@kamatari (orig r2367):  dshaligram | 2007-10-07 12:16:53 -0400
 Unicode makefile tweak for trunk.
 r7069@kamatari (orig r2368):  zelgadis | 2007-10-07 21:15:23 -0400
 Ran into a bug where searching backwards through inventory for a free
 slot which won't leave gaps (in find_free_slot()) would fail if the
 inventory was empty; fixed bug by making find_free_slot() retry with
 forwards search if backwards search failed.  I can't reproduce the bug,
 but the fix doesn't seem to cause any problems when there isn't a bug.
 
 r7070@kamatari (orig r2369):  zelgadis | 2007-10-08 00:25:58 -0400
 Make mpr_comma_separated_list() end the message with a period.
 
 r7071@kamatari (orig r2370):  zelgadis | 2007-10-08 01:55:47 -0400
 Added class CrawlHashTable, a savable/loadable string-keyed
 associative array with heterogeneous values, capable of holding
 booleans, bytes, shorts, longs, floats, string, coordinates
 (coord_def), items (item_def) and nested hash tables.  A table can be
 made to be homogeneous by giving it a value type, which causes dynamic
 type checking to be performed.  The same type checking can be
 performed for individual member values of a heterogeneous table by
 setting a flag on that value.  A flag can also be set on an individual
 member value to prevent its value from being changed.
 
 CrawlHashTable is currently only used for the props field of the
 item_def struct (though it could easily be added elsewhere), and is
 only being used by decks.  The deck structure has been changed so that
 deck.plus is the original number of cards in the deck, deck.plus2 is
 either the number of cards used or the number of cards left, and
 deck.special hold the deck's rarity.  The cards themselves are
 selected at deck creation time and stored in the nested hash table
 deck.props["cards"].  The Nemelex "Peek Deck" ability has been changed
 to identify the deck, draw three cards from it, show them to the user,
 and shuffle them back into the deck (with special cases for decks
 containing only one or two cards).  A fourth Nemelex ability, "Mark
 Deck", has been added, which picks four cards from the deck, marks
 them, and then shuffles them back into the deck, creating a deck with
 a mixture of marked and unmarked cards.
 
 r7072@kamatari (orig r2371):  dshaligram | 2007-10-08 07:10:52 -0400
 Fixed map colours being inherited by unrelated maps during compilation.
 Pause after reporting an error for dgamelaunch so that the dgl menu does not hide the error message.
 r7074@kamatari (orig r2373):  dshaligram | 2007-10-08 07:58:07 -0400
 Make Escape cancel out of menu and prompt for the ability and spellcasting menus (Marc).
 r7077@kamatari (orig r2375):  dshaligram | 2007-10-08 08:28:20 -0400
 Fixed ENCH_SLEEPY persisting for too long with ensorcelled hibernation.
 r7078@kamatari (orig r2376):  dshaligram | 2007-10-08 08:34:40 -0400
 Removed unnecessary ench_sleepy duration.
 r7079@kamatari (orig r2377):  dshaligram | 2007-10-08 10:01:16 -0400
 Ghosts can use ensorcelled hibernation. Breaks saves, needs some work on PC sleep and wake-up correctness.
 r7080@kamatari (orig r2378):  dshaligram | 2007-10-08 10:06:54 -0400
 s/cannot_move/cannot_act/ for clarity.
 r7081@kamatari (orig r2379):  dshaligram | 2007-10-08 13:22:04 -0400
 Fixed crash when summoned creature is killed by trap (Iaido) - monsters should not trigger traps on creation, only when moving onto a square.
 
 Upped ammo preservation chances for javelins (Chilliwack).
 r7083@kamatari (orig r2381):  dshaligram | 2007-10-08 13:47:17 -0400
 Re-enable ghosts in Labyrinths.
 r7084@kamatari (orig r2382):  dshaligram | 2007-10-08 14:18:10 -0400
 Adjust piety costs for various god powers.
 r7086@kamatari (orig r2384):  j-p-e-g | 2007-10-08 15:26:19 -0400
 Applying dolorous' latest patch (1806451), mostly
 correcting typos in the comments and changing Xom
 stimulation from 256 to 255 (as the function 
 apparently cannot handle that).
 
 r7087@kamatari (orig r2385):  j-p-e-g | 2007-10-08 15:28:58 -0400
 Minor changes to net, one shoving debug information into
 DEBUG_DIAGNOSTICS compile, another changing net 
 descriptions.
 
 r7089@kamatari (orig r2387):  dshaligram | 2007-10-08 16:08:53 -0400
 Orc knights and warlords can yell battle-cries to make lesser orcs fight better.
 r7090@kamatari (orig r2388):  dshaligram | 2007-10-08 16:22:04 -0400
 Orc battle cries respect silence and also boost physical ranged attacks.
 r7091@kamatari (orig r2389):  zelgadis | 2007-10-09 07:39:22 -0400
 Added an actual vector version of CrawlHashTable, and removed the code
 for making a hash table imitate a vector.  Since there's now more than
 just one type of savable/restorable container, hash.cc and hash.h have
 been renamed to store.cc and store.h ("store" for storage).
 
 Destroying/unlinking/deleting an item now clears out the item's props
 field.
 
 r7092@kamatari (orig r2390):  dshaligram | 2007-10-09 07:56:58 -0400
 Moved orc battle cries to sound channel, increased duration to reduce message spam.
 r7096@kamatari (orig r2394):  j-p-e-g | 2007-10-09 10:59:08 -0400
 Allow bargains in bazaars, ranging from 60% to 95%.
 The value of created items is also increased by a fair bit.
 
 I also changed species MR as in the last post of FR 1787813:
 all Elves get 4, Ogre Mage 5, and Demigods also 4.
 
 Someone (Darshan?) will probably want to twiddle with the 
 numbers, at least for the bazaars, so for now, I'll put off 
 committing this into 0.3.
 
 r7097@kamatari (orig r2395):  j-p-e-g | 2007-10-09 11:04:14 -0400
 Make mechanical traps in Orcish Mines and Elven Halls of
 appropriate racial type.
 I'd prefer it if there was a chance involved but IMHO a
 given trap should shoot the same (racial) type of ammo,
 so this is now always the case in these two branches, for 
 all of needle, arrow, bolt, spear and axe traps.
 
 r7098@kamatari (orig r2396):  dshaligram | 2007-10-09 12:05:08 -0400
 Returning weapon beam path updates for trunk.
 r7100@kamatari (orig r2398):  dshaligram | 2007-10-09 12:40:48 -0400
 Branded weapons and armour are now always visibly special.
 r7102@kamatari (orig r2400):  dshaligram | 2007-10-09 14:15:07 -0400
 Fixed temple_secret_doors: playing hide-and-seek with the Temple is not good.
 r7104@kamatari (orig r2402):  j-p-e-g | 2007-10-09 17:46:52 -0400
 Updating level-design.txt (done by David), mostly spacing
 changes but also a few content differences, e.g. removing
 information on tricky.des and adding information on some
 new features (I think, it's hard to tell what was already
 in the older version with all this indenting going on).
 
 r7106@kamatari (orig r2403):  zelgadis | 2007-10-09 23:43:21 -0400
 Remember and describe randart properties which have been learned via
 wearing the randart.  Breaks savefile compatibility for saved games
 containing any randarts.
 
 r7107@kamatari (orig r2404):  dshaligram | 2007-10-10 02:02:22 -0400
 Fix los radius check in can_see().
 r7109@kamatari (orig r2406):  dshaligram | 2007-10-10 13:39:13 -0400
 [1810484] Fixed Lua userdata leak - shouldn't use luaL_checkudata from __gc metamethod.
 r7110@kamatari (orig r2407):  dshaligram | 2007-10-10 13:52:21 -0400
 [1809884] Fixed detected_item_colour being clobbered with black.
 r7111@kamatari (orig r2408):  dshaligram | 2007-10-10 13:55:22 -0400
 Removed hardcoding in travel colour check.
 r7113@kamatari (orig r2410):  dshaligram | 2007-10-10 14:16:16 -0400
 [1809278][1809633] Fixed spotty level badness.
 r7114@kamatari (orig r2411):  dshaligram | 2007-10-10 14:23:53 -0400
 Fixed DEPTH for david_defended_altar.
 r7115@kamatari (orig r2412):  dshaligram | 2007-10-10 14:54:31 -0400
 New vaults, courtesy bobbens.
 r7117@kamatari (orig r2414):  dshaligram | 2007-10-10 15:14:11 -0400
 Fixed all abilities being listed as using piety (jarpiain).
 r7120@kamatari (orig r2417):  zelgadis | 2007-10-10 20:03:04 -0400
 Re-roll randarts which have no properties, plus randart jewellery
 where the properties are redundant or conflicting with respect to the
 base jewellery type.  Also, add known randart properties boolean vector
 to unrandarts.
 
 r7122@kamatari (orig r2419):  zelgadis | 2007-10-10 23:23:34 -0400
 For unidentified randart jewellery, remember and display obvious-from-wearing
 effects caused by the base type item as if they were randart properties.
 
 Related changes:
 
 * Equpping or unequipping a ring of magical power or staff of power will
   give a message about mana capacity increasing/decreasing.
 
 * The randart property RAP_MAGICAL_POWER has been added.
   randart_wpn_property() doesn't yet give this to any randarts, but
   the rest of the code for it is in place.
 
 r7123@kamatari (orig r2420):  zelgadis | 2007-10-11 01:04:23 -0400
 Oops, was using UNIQ_LOST_IN_ABYSS wrongly.
 
 r7124@kamatari (orig r2421):  dshaligram | 2007-10-11 02:23:48 -0400
 [1807611] Inventory menus show weight of stack, not one item in stack.
 r7126@kamatari (orig r2423):  dshaligram | 2007-10-11 07:51:53 -0400
 [1804499] Fixed acquirement occasionally mauling unrandarts and producing bad items.
 r7128@kamatari (orig r2425):  dshaligram | 2007-10-11 10:33:01 -0400
 [1809728] Fixed bug where you could get multiple levels of a single-level mutation (such as torment resistance).
 r7130@kamatari (orig r2427):  dshaligram | 2007-10-11 10:41:10 -0400
 [1811182] Fixed help screen hotkeys.
 r7132@kamatari (orig r2429):  dshaligram | 2007-10-11 11:15:23 -0400
 [1808191] Fixed truncated imp messages.
 r7134@kamatari (orig r2431):  dshaligram | 2007-10-11 12:43:34 -0400
 Fixed minimum distance of lab entrance from exit.
 r7135@kamatari (orig r2432):  dshaligram | 2007-10-11 12:50:19 -0400
 Lock before opening .dsc files.
 r7137@kamatari (orig r2434):  dshaligram | 2007-10-11 13:00:28 -0400
 Unflasked efreets are now permanent and more likely to be friendly.
 r7138@kamatari (orig r2435):  dshaligram | 2007-10-11 13:12:58 -0400
 Upped Beogh weapon damage bonus.
 r7139@kamatari (orig r2436):  dshaligram | 2007-10-11 13:29:03 -0400
 Adjusted enchantment durations for paralysis and confusion.
 r7140@kamatari (orig r2437):  dshaligram | 2007-10-11 14:09:32 -0400
 Fixed Lugonu's Corruption, remaining cases of truncated monster shouts.
 r7142@kamatari (orig r2439):  dshaligram | 2007-10-11 14:18:15 -0400
 Dropped cost of smiting for TSO.
 r7143@kamatari (orig r2440):  dshaligram | 2007-10-11 14:32:53 -0400
 Weakened monster lightning damage, dropped AC protection from lightning damage by half.
 r7145@kamatari (orig r2442):  haranp | 2007-10-11 15:51:55 -0400
 Fix for 1805138: wands of draining no longer leak information when the
 bolt misses.
 
 r7146@kamatari (orig r2443):  haranp | 2007-10-11 16:10:42 -0400
 Fix for 1807899: stash-examining a shop will trigger ID noting.
 
 r7147@kamatari (orig r2444):  haranp | 2007-10-11 16:16:40 -0400
 Dwarves and orcs now get +1 to-dam when throwing racial gear. (Yup,
 this includes armour.) [1804894]
 
 r7148@kamatari (orig r2445):  dshaligram | 2007-10-12 02:29:56 -0400
 [1811733] Brand plants on stairs.
 r7149@kamatari (orig r2446):  dshaligram | 2007-10-12 04:41:38 -0400
 Added -O2 -Wuninitialized to Unix makefile.
 r7151@kamatari (orig r2448):  dshaligram | 2007-10-12 15:38:28 -0400
 Updated CREDITS.
 r7152@kamatari (orig r2449):  j-p-e-g | 2007-10-12 17:45:59 -0400
 A few tiny changes courtesy of dolorous.
 1811785: mummy food/drink checks changed to US_UNDEAD check
 1811735: vampires don't get holy weapons from acquirement
 1811249: remove redundant poison resistance check for Ghouls
 1810890: very minor comment fix
 
 r7153@kamatari (orig r2450):  zelgadis | 2007-10-13 01:17:12 -0400
 This change breaks savefile compatibility.
 
 Removed speed_inc field from monsterentry struct and added field
 energy_usage, which lets a monster take different amounts of time for
 different types of actions, defaulting to 10 points of energy for
 everything but picking up an object, which defaults to 100% of the
 monster's speed (the same as before this change).  This is currently
 only used to make curse toes move at half the speed with which they
 attack (which was previously hard-coded), but is could be used for a
 lot of interesting things.
 
 A related change is that the manner in which apply_enchantment() deals
 with a monster moving at a different rate than the player has changed
 for monsters with non-zero-speed.  As an example, giant bats have a
 speed of 30, which means that apply_enchantments() gets called three
 times per player move if the player is at normal speed;
 apply_enchantment() has to compensate for this so that a poisoned bat
 doesn't suffer three times the damage as a monster with speed 10.
 Monsters being able to do things in energy increments of other than 10
 complicated this, and the easiest way to deal with the complication
 was to keep track of how much energy a monster had recently expended
 with the new monsters class member ench_countdown, and use that to
 call apply_enchantments() once for every normal-speed player move
 (zero-speed monsters are still dealt with in the same manner as
 before).  Because of this, the "spd" variable in apply_enchantment()
 and decay_enchantment() is normalized to 10 for all non-zero-speed
 monsters.  This doesn't work for ENCH_HELD, since a fast monster
 should be able to escape from a net more quickly than a slow monster.
 I've tried to compensate for this, but I'm not sure if I've done it
 right.
 
 r7154@kamatari (orig r2451):  zelgadis | 2007-10-13 01:58:53 -0400
 Fix giving an interruption message when a monster ignored with the
 runrest_ignore_monster option gets too close.  Also give a more
 informative interruption message when an air elemental quits being
 "submerged" in the air, and give a new message when it first
 "submerges" itself into the air.
 
 r7155@kamatari (orig r2452):  zelgadis | 2007-10-13 02:07:38 -0400
 Oops, overlooked that ench_countdown needs to be rescaled when a monster
 gains or loses the slow or haste enchantments.
 
 r7156@kamatari (orig r2453):  j-p-e-g | 2007-10-13 09:50:13 -0400
 Implementing merfolk monsters. There are two types, merfolk fighters,
 and mermaids. The latter are more interesting. ;)
 
 Whenever a mermaid sings there's a chance you get beheld, meaning you
 cannot move away from the mermaid, that is cannot increase the 
 distance between you and her. (Because of the distance pecularities
 this means at dist 1 you can only be NSW or E of the mermaid but not
 the diagonal directions.) 
 If you manage to be beheld by several mermaids at the same time, your 
 movements have to respect the distance to all of them.
 
 I've added a vector beheld_by that keeps track of beholding monsters
 and makes checking distance and updating beholding status easier.
 
 Merfolk are immune to the mermaid song.
 
 r7157@kamatari (orig r2454):  j-p-e-g | 2007-10-13 09:57:46 -0400
 Adding a description for merfolk fighters and mermaids.
 
 r7158@kamatari (orig r2455):  haranp | 2007-10-13 19:28:11 -0400
 Fixed "shiny" and "embroidered" items not showing as white in abbreviated
 display.
 Fix bad merfolk energy.
 
 r7159@kamatari (orig r2456):  zelgadis | 2007-10-14 00:09:48 -0400
 handle_monster_move() still wasn't dealing quite right with invoking
 apply_enchantments(), since a monster could have apply_enchantments() not
 called for a normal-speed player turn, and then get called twice in a row
 during the next turn.  This fix also makes zero-speed monsters like plants
 have apply_enchantments() be handled the same way as other monsters,
 so enchantments are now allways processed in time increments of 10
 energy units (cloud processing for zero speed monsters is still handled
 separately, though).
 
 
 r7160@kamatari (orig r2457):  zelgadis | 2007-10-14 01:20:15 -0400
 Give a message and interrupt activity if a visible door is opened or
 eaten by an unseen monster (either invisible or out of line of sight).
 
 r7161@kamatari (orig r2458):  zelgadis | 2007-10-14 03:52:00 -0400
 The clear() methods should clear the default_flags and type members,
 as well as clearing out the contained values.
 
 r7162@kamatari (orig r2459):  zelgadis | 2007-10-14 04:29:33 -0400
 Added to classes actor, monsters and player the method can_pass_through(),
 which returns true for a grid that the monster or player can pass trhough.
 Also added new monster type "rock worm" to demonstrate a monster which
 can pass through solid walls.
 
 r7163@kamatari (orig r2460):  zelgadis | 2007-10-14 06:53:00 -0400
 Wrong feature name order for statues.
 
 r7164@kamatari (orig r2461):  haranp | 2007-10-14 19:46:16 -0400
 Tomb rebalancing.
 
 r7166@kamatari (orig r2462):  nlanza | 2007-10-14 21:04:56 -0400
 Squash unused-variable warnings by only declaring variables that exist solely
 for ASSERT when we're defining DEBUG.
 
 r7167@kamatari (orig r2463):  nlanza | 2007-10-14 21:06:18 -0400
 Add store.{cc,h} to the Xcode build and clean up debugging support a bit.
 
 r7168@kamatari (orig r2464):  zelgadis | 2007-10-15 00:03:33 -0400
 Removed amnesia/forgetfullness trap, mutation and scroll.  The
 mutation has been replaced with an involuntary shouting mutation,
 and the trap with an alarm trap.  The scroll hasn't been replaced with
 anything, and the frequency of scrolls of random uselessness has thus
 doubled; someone needs to re-do the scroll frequencies.
 
 Also added a "drifting" mutation, which causes the player to sometimes
 drift in a random direction after moving.
 
 r7169@kamatari (orig r2465):  zelgadis | 2007-10-15 02:36:07 -0400
 Some fixes for mermaid beholding:
 
 * A mermaid stops beholding if it polymorphs into something else.
 
 * If new walls are created, then Crawl stops the beholdment of any
   mermaid that gets hidden by the new walls.
 
 * Do paranoid sanity checking on beholders before each command with
   check_beholders() and try to restore sanity if any bugs are
   found (and give a diagnostics message if DEBUG is set).
 
 r7170@kamatari (orig r2466):  zelgadis | 2007-10-15 04:45:04 -0400
 If a submerged monster moves onto a grid in which it can't be submerged,
 force it to unsuberge (i.e., a mermaid moving directly from water onto
 floor without first unsubmerign).
 
 If a submerged monster shouts, force it to unsubmerge first.
 
 If a visible submerged monster unsubmerges within view of the player,
 say that it "bursts forth from the water" if it can travel over land,
 and that it "surfaces" otherwise, rather than saying that it "comes
 into view".  If an invisble sumberged monster unsubmerges within view
 of a player who can't see invisible, and it can move over land,
 say "something invisble bursts forth from the water".
 
 r7171@kamatari (orig r2467):  zelgadis | 2007-10-15 06:32:44 -0400
 Fix problem of friendly monsters not using any energy when there's
 nothing around to fight and they're right next to the player.
 
 r7172@kamatari (orig r2468):  dshaligram | 2007-10-15 07:28:19 -0400
 Fixed bad grammar in highscore entry for characters killed by hellfire.
 r7173@kamatari (orig r2469):  dshaligram | 2007-10-15 07:41:50 -0400
 Fixed bad treatment of ghosts and pandemonium lords that get the delayed fireball spell. Also allow pan lords to get orc slaying or disruption brands if the player merits it.
 r7174@kamatari (orig r2470):  dshaligram | 2007-10-15 07:54:13 -0400
 Fixed yaktaurs picking up two crossbows and switching crossbows before each shot.
 r7175@kamatari (orig r2471):  dshaligram | 2007-10-15 08:10:59 -0400
 Cleanup: move_item_to_grid returns a bool to indicate that drop was successful.
 r7176@kamatari (orig r2472):  dshaligram | 2007-10-15 08:27:57 -0400
 [1813214] Trog should not gift the Wrath of Trog.
 r7177@kamatari (orig r2473):  dshaligram | 2007-10-15 08:45:17 -0400
 Shift-run doesn't distinguish between wall types to make it more useful in labyrinths.
 r7178@kamatari (orig r2474):  dshaligram | 2007-10-15 09:00:44 -0400
 Yaks gore.
 r7179@kamatari (orig r2475):  dshaligram | 2007-10-15 12:32:08 -0400
 Fixed Demonspawn getting multiple levels of single-level mutations (cbus).
 r7180@kamatari (orig r2476):  dshaligram | 2007-10-15 12:47:48 -0400
 Fixed level that was breaking trunk.
 r7181@kamatari (orig r2477):  dshaligram | 2007-10-15 13:05:01 -0400
 Dropped chances of unbranded enchanted items being glowing/runed.
 r7185@kamatari (orig r2479):  haranp | 2007-10-15 19:25:45 -0400
 Added basic HTML output functionality to formatted_string. Not used
 anywhere yet.
 
 r7186@kamatari (orig r2480):  haranp | 2007-10-15 19:52:18 -0400
 Self-banishment is not considered unholy. Banishment at the air is still
 unholy. [1767848]
 
 r7187@kamatari (orig r2481):  zelgadis | 2007-10-16 03:08:28 -0400
 Added new field seen_context to the monsters class, which can be set
 to cause a non-standard context to be passed to
 interrupt_activity( AI_SEE_MONSTER ) if it is called before the current turn
 is over.
 
 If a submerged monster surfaces in order to shout, it has to wait one
 turn before being able to submerge again.
 
 Added back in a scroll named "forgetfullness", but rather than giving
 amnesia about the map it gives amnesia about non-equipped inventory
 items.  I tried to make the effects annoying rather than serious.
 
 r7188@kamatari (orig r2482):  zelgadis | 2007-10-16 03:32:17 -0400
 Fix for bug 1813676: handle_monster_move() should have been returning
 immediately if applying the monster's enchantments caused the monster
 structure to be reset, thus rendering the monster invalid.
 
 r7189@kamatari (orig r2483):  haranp | 2007-10-16 04:18:17 -0400
 Summoned monsters now have the (increasingly misnamed) CREATED_FRIENDLY
 flag, so they don't give XP, even if initially hostile, to prevent scumming.
 [1784802]
 
 r7190@kamatari (orig r2484):  haranp | 2007-10-16 05:09:10 -0400
 s/Location/Place/ (David)
 
 r7191@kamatari (orig r2485):  haranp | 2007-10-16 05:32:26 -0400
 Forgetfulness removed; it's now a scroll of fog with a 1-in-10 chance
 of producing miasma instead.
 
 r7192@kamatari (orig r2486):  haranp | 2007-10-16 05:39:09 -0400
 Minor note formatting improvements (David.)
 
 r7193@kamatari (orig r2487):  haranp | 2007-10-16 05:44:06 -0400
 Wands shouldn't be generated without charges.
 
 r7194@kamatari (orig r2488):  zelgadis | 2007-10-18 13:32:38 -0400
 Lua accessors for you.x_pos, you.y_pos and you.pos
 
 r7195@kamatari (orig r2489):  zelgadis | 2007-10-18 13:42:50 -0400
 Added fog machine Lua map markers.  Needs a C interface to make it usable
 in level generation.
 
 Clouds now have a "spread rate" field, which by default uses the same
 per-cloud-type rate as before (normal spread rate for steam, grey smoke
 and black smoke, no spreading for other cloud types).  Might want to make
 the spread rate decrease as the cloud spreads (currently it remains
 unchanged).
 
 Added new dungeon event type "entered level", to complement "entering level".
 
 r7196@kamatari (orig r2490):  haranp | 2007-10-19 12:30:10 -0400
 1815768: some NOTE_USER_NOTEs should be NOTE_MESSAGE instead (actually
 they should be yet another note type, but NOTE_MESSAGE works for now.)
 
 r7197@kamatari (orig r2491):  haranp | 2007-10-19 13:20:43 -0400
 Hurting holies was being counted as KILL_ANGEL instead of ATTACK_HOLY (bobbens)
 
 r7199@kamatari (orig r2493):  haranp | 2007-10-19 18:30:42 -0400
 Menus are now tagged. Menu colours now only apply to a menu with a matching
 tag, unless the menu colour tag is empty or "any".
 Menu colours are specified as tag:colour:pattern, where the "tag:" part
 is optional (default is empty tag, i.e., all menus.)
 The following menu tags exist: ability, description, equip, help, inventory,
 notes, resists, spell, stash.
 Default .crawlrc should probably be changed (and the docs, too...)
 
 r7200@kamatari (orig r2494):  zelgadis | 2007-10-20 00:18:07 -0400
 Oops, couldn't set a non-default 0% cloud spread rate.
 
 r7201@kamatari (orig r2495):  haranp | 2007-10-20 04:23:44 -0400
 Menu tagging corrections + docs + initfile (David)
 
 r7202@kamatari (orig r2496):  dshaligram | 2007-10-20 14:05:53 -0400
 Moved position information Lua functions to luadgn.cc.
 r7203@kamatari (orig r2497):  dshaligram | 2007-10-20 14:11:16 -0400
 Blademasters and master archers shouldn't pick up weapons.
 r7205@kamatari (orig r2499):  dshaligram | 2007-10-21 04:36:44 -0400
 Rock stair travel fix for trunk.
 r7206@kamatari (orig r2500):  dshaligram | 2007-10-21 05:47:19 -0400
 Note when Xom banishes player.
 r7207@kamatari (orig r2501):  dshaligram | 2007-10-21 08:01:09 -0400
 [1816969] Use AT_NO_ATK in mon-data.h for unused monster attacks (bobbens).
 r7208@kamatari (orig r2502):  dshaligram | 2007-10-21 08:20:11 -0400
 Added missing double-quote (bobbens).
 r7209@kamatari (orig r2503):  dshaligram | 2007-10-21 08:31:11 -0400
 [1813910] Typo fixes in mutation messages (dolorous).
 r7210@kamatari (orig r2504):  dshaligram | 2007-10-21 09:05:22 -0400
 [1800206] Ghoul food cleanup (dolorous).
 r7211@kamatari (orig r2505):  j-p-e-g | 2007-10-21 09:49:11 -0400
 Add information to demon weapons that Demonspawn fight better with them.
 (Hmmm, while I wrote Demonspawns going by proper grammar rules my gut 
 feeling says it should be simply "Demonspawn" without that "s". Help?)
 
 Also catering to FR 1816411: disallow elven M&F as well as dwarven Pole-arms.
 
 r7213@kamatari (orig r2506):  dshaligram | 2007-10-21 11:29:17 -0400
 [1795751] Mutation cleanup, courtesy dolorous.
 r7214@kamatari (orig r2507):  dshaligram | 2007-10-21 11:36:04 -0400
 Fixed permanent transforms (syllogism).
 r7217@kamatari (orig r2510):  dshaligram | 2007-10-21 13:43:14 -0400
 Fixed Lua dependency for trunk.
 r7218@kamatari (orig r2511):  dshaligram | 2007-10-21 15:14:03 -0400
 Accept "none" as a brand without carping about it to stderr.
 r7220@kamatari (orig r2513):  j-p-e-g | 2007-10-21 18:19:23 -0400
 Demigods no longer have a fast metabolism and gain random stats 
 more often. I thought there was a FR about this somewhere but
 maybe it was "only" suggested in the discussion group. Anyway,
 I've been told this has been sanctioned from "high up", so
 here it is. ;)
 Oh, and fix that Demonspawn plural.
 
 r7222@kamatari (orig r2515):  j-p-e-g | 2007-10-22 07:00:16 -0400
 Applying two patches by dolorous:
 1817546: refix Beogh butchering crash
 1817459: fix a couple of typos
 
 r7223@kamatari (orig r2516):  dshaligram | 2007-10-22 12:13:40 -0400
 Fixed monsters wearing shields and other inappropriate armour as body armour.
 r7224@kamatari (orig r2517):  j-p-e-g | 2007-10-22 17:30:59 -0400
 Changing screaming mutation to influence both frequency
 and volume of shouting -> yelling -> screaming. Reduced
 frequency of level 2 and 3 to make up for greater range.
 When paralysed, you are unable to scream.
 
 Also cleaning up mutation listings.
 
 r7225@kamatari (orig r2518):  haranp | 2007-10-23 07:25:01 -0400
 Fixed bad message with RAP_MAGICAL_POWER.
 Type safety; this required moving randart_prop_type to enum.h.
 
 r7228@kamatari (orig r2521):  dshaligram | 2007-10-23 12:53:11 -0400
 [1815754] Mutagenic randarts are less mutagenic.
 r7229@kamatari (orig r2522):  haranp | 2007-10-23 12:58:30 -0400
 Blade card now gives feedback when failing to brand.
 Blade card can now give different brands, not just SPWPN_VORPAL.
 Type safety on brand_weapon().
 
 r7230@kamatari (orig r2523):  haranp | 2007-10-23 13:50:10 -0400
 You can now Triple Draw from decks you aren't wielding.
 
 r7231@kamatari (orig r2524):  haranp | 2007-10-23 17:14:20 -0400
 Some code cleanup.
 
 r7232@kamatari (orig r2525):  haranp | 2007-10-23 17:23:06 -0400
 Receiving a pure deck from Nemelex now decays the appropriate sacrifice
 weight by 20%.
 
 r7233@kamatari (orig r2526):  j-p-e-g | 2007-10-23 18:19:01 -0400
 Adding Vampire aptitudes to tables.txt (Bug 1816344). 
 Also changed Ranged Combat to Throwing, while I was at it.
 
 Fixing 1817775: portaled projectile treats returning weapons like
 any other projectile (no duplicates any more, but also no returning).
 I think this makes sense, seeing how the spell teleports it somewhere
 so how should it know the path back.
 
 Fixing 1817995: starting items not stacking correctly.
 Question: Why is the flag BEEN_IN_INV even set for starting inventory?
 
 Applying two patches by dolorous:
 1818736: comment fix for MUT_SAPROVOROUS
 1818667: remove redundant MUT_HOOVES check
 
 r7234@kamatari (orig r2527):  haranp | 2007-10-23 18:24:01 -0400
 Added Lugonu greeting message (Jovann)
 
 r7236@kamatari (orig r2529):  dshaligram | 2007-10-24 04:08:04 -0400
 Fixed bad play time format in character dump, removed turns_by_place and kills_by_place from the default dump_order.
 r7238@kamatari (orig r2531):  haranp | 2007-10-24 04:58:17 -0400
 Lugonu invocations are now invocations and have fail rates.
 
 r7239@kamatari (orig r2532):  dshaligram | 2007-10-24 05:29:20 -0400
 Orc battle cry fixes (shouldn't affect berserk/confused/paralysed monsters). Affected orcs are woken up if they happen to be asleep (<3).
 Ensorcelled hibernation should not work on berserk creatures.
 r7240@kamatari (orig r2533):  dshaligram | 2007-10-24 05:39:19 -0400
 [1818732] Merfolk hunters start with a knife.
 r7241@kamatari (orig r2534):  dshaligram | 2007-10-24 06:08:24 -0400
 [1818767] Idle time clamped at 5 minutes.
 r7242@kamatari (orig r2535):  dshaligram | 2007-10-24 08:42:08 -0400
 [1818799] Reduce message spam from Olgreb's toxic radiance.
 r7243@kamatari (orig r2536):  dshaligram | 2007-10-24 09:19:24 -0400
 [1757174] Disallow mapping in labyrinths.
 r7244@kamatari (orig r2537):  j-p-e-g | 2007-10-24 10:05:13 -0400
 Add a "forget level map" command, Ctrl-F, to level map. This command used
 to be for waypoints along with Ctrl-W but as that never made it into the
 level map help I don't think it matters. (FR 1745112)
 
 r7245@kamatari (orig r2538):  j-p-e-g | 2007-10-24 10:54:49 -0400
 Add "forget level" command to manual, and change wording of
 the deformed body mutation for Centaurs and Nagas (FR 1814790).
 
 r7247@kamatari (orig r2540):  dshaligram | 2007-10-24 12:21:32 -0400
 [1779076] Greedy explore will ignore items (after prompting) if autopickup fails twice on the same spot, such as when inventory is full. If pickup_dropped = true (not likely if greedy explore is in use), greedy explore uses the old strategy of not budging until the item is picked up.
 r7248@kamatari (orig r2541):  dshaligram | 2007-10-25 01:22:59 -0400
 Fixed bugs in greedy-explore's item ignore prompts.
 r7249@kamatari (orig r2542):  dshaligram | 2007-10-25 03:13:13 -0400
 [1813368] Makhleb/Vehumet passive power gain now active without needing to pray. Vehumet's spell boost and warding must still be prayed for.
 r7250@kamatari (orig r2543):  dshaligram | 2007-10-25 05:11:50 -0400
 Spell changes: strengthened stone arrow and the storms, weakened bolts of fire and cold, and crystal spear.
 (Re)allow partial spell names when using &Z in wizmode.
 r7251@kamatari (orig r2544):  haranp | 2007-10-25 05:24:32 -0400
 Added Pain (== agony) and Torment (== Symbol of Torment) to the
 Deck of Destruction.
 Boosted cost of Stack Deck.
 
 r7252@kamatari (orig r2545):  dshaligram | 2007-10-25 05:49:39 -0400
 [1810433] Ogre hunters start with large rocks. Monster ogres can also throw large rocks but are never generated with rocks.
 r7253@kamatari (orig r2546):  haranp | 2007-10-25 06:07:25 -0400
 Drawing from Destruction with no monsters nearby does not gain piety.
 
 r7254@kamatari (orig r2547):  haranp | 2007-10-25 06:09:32 -0400
 Doc fixes (Erik)
 
 r7255@kamatari (orig r2548):  haranp | 2007-10-25 06:16:06 -0400
 More doc fixes (Erik)
 
 r7256@kamatari (orig r2549):  dshaligram | 2007-10-25 06:16:22 -0400
 [1819634] Fixed filenames missing in Lua file-not-found error messages.
 r7257@kamatari (orig r2550):  dshaligram | 2007-10-25 06:18:29 -0400
 [1817064] Fixed shift-running stopping for secret doors.
 r7258@kamatari (orig r2551):  dshaligram | 2007-10-25 06:28:15 -0400
 [1817804] Fixed bogus "You're already here" messages from interlevel travel.
 r7259@kamatari (orig r2552):  dshaligram | 2007-10-25 06:35:36 -0400
 [1816483] Sling bullets should not be poisoned.
 r7260@kamatari (orig r2553):  dshaligram | 2007-10-25 06:42:58 -0400
 [1817009] Changed secret-doored temple entrance.
 r7261@kamatari (orig r2554):  haranp | 2007-10-25 06:44:29 -0400
 No unnecessary double messaging when drawing the Wraith.
 
 r7262@kamatari (orig r2555):  haranp | 2007-10-25 06:51:30 -0400
 more doc fixes (Erik)
 
 r7263@kamatari (orig r2556):  haranp | 2007-10-25 07:06:37 -0400
 More doc fixes.
 
 r7264@kamatari (orig r2557):  j-p-e-g | 2007-10-25 07:40:09 -0400
 FR 1818615: modify prayer prompt to stop praying for 'y',
 renew prayer for 'r' and cancel prompt for anything else.
 
 r7266@kamatari (orig r2559):  dshaligram | 2007-10-25 08:19:25 -0400
 dgn_place_map takes a coord_def to specify the centre of the map for minivaults and floating vaults. This placement can be activated using an asterisk (mapname*) when entering the name of the map in the &L command.
 r7267@kamatari (orig r2560):  j-p-e-g | 2007-10-25 08:45:42 -0400
 Applying two patches by dolorous:
 1819730: remove redundancy for creating random undead servant (Yred)
 1819013: typo fix
 
 Also modified spell description for Portaled Projectile.
 
 r7268@kamatari (orig r2561):  dshaligram | 2007-10-25 08:53:10 -0400
 [1818982] Kenku talons as mutation (dolorous).
 r7270@kamatari (orig r2563):  dshaligram | 2007-10-25 09:02:05 -0400
 [1786778] Fixed dolinks.sh and domake.sh (dolorous).
 r7273@kamatari (orig r2566):  haranp | 2007-10-25 09:24:37 -0400
 Added Trowel portal generation. Somewhat buggy.
 
 r7274@kamatari (orig r2567):  dshaligram | 2007-10-25 09:43:39 -0400
 Added a flag to disable generation of exits from a vault. Need to clean up vault placement to make it easier to parameterise it.
 r7275@kamatari (orig r2568):  dshaligram | 2007-10-25 09:45:08 -0400
 Only non-trolls get hunger from troll leather armour (syllogism).
 r7276@kamatari (orig r2569):  haranp | 2007-10-25 10:49:06 -0400
 Type safety and code cleanup.
 
 r7277@kamatari (orig r2570):  dshaligram | 2007-10-25 10:59:57 -0400
 [1804809] Fixed buggy handling of colour overlays.
 r7278@kamatari (orig r2571):  haranp | 2007-10-25 11:05:11 -0400
 Minor code cleanup.
 
 r7279@kamatari (orig r2572):  dshaligram | 2007-10-25 12:02:13 -0400
 Use a safer macro for clua ret (doy).
 r7280@kamatari (orig r2573):  dshaligram | 2007-10-25 12:16:36 -0400
 Fixed bug that consistently placed characters too near the exit in labyrinths.
 r7281@kamatari (orig r2574):  dshaligram | 2007-10-25 12:48:10 -0400
 Fixed labyrinth sizes for trunk.
 r7282@kamatari (orig r2575):  dshaligram | 2007-10-25 13:11:44 -0400
 Fixed wizmode segfault on &^ with no god.
 r7283@kamatari (orig r2576):  dshaligram | 2007-10-25 13:25:35 -0400
 Refixed labyrinth entry point.
 r7285@kamatari (orig r2578):  dshaligram | 2007-10-25 14:43:19 -0400
 Fixed bug that would allow Lua dofile on arbitrary files using absolute paths.
 r7287@kamatari (orig r2580):  dshaligram | 2007-10-25 22:42:56 -0400
 Dropped to-hit on javelins.
 r7288@kamatari (orig r2581):  dshaligram | 2007-10-25 23:33:48 -0400
 Suppress unnecessary "Floor." lines when looking around and targeting.
 r7289@kamatari (orig r2582):  dshaligram | 2007-10-25 23:53:22 -0400
 [1820172] Typo fixes (dolorous).
 r7290@kamatari (orig r2583):  dshaligram | 2007-10-26 01:09:10 -0400
 Beogh orcs will follow the PC downstairs even if they're not directly adjacent to the player, but are adjacent to other friendly orcs that are (in)directly adjacent to the player.
 r7291@kamatari (orig r2584):  dshaligram | 2007-10-26 04:33:37 -0400
 Monsters can gain experience and level-up. Breaks saves.
 r7292@kamatari (orig r2585):  dshaligram | 2007-10-26 04:38:36 -0400
 Monsters lose experience when drained.
 r7293@kamatari (orig r2586):  dshaligram | 2007-10-26 07:11:03 -0400
 Orcs may surrender to Beogh worshippers when beaten up. Adjusted experience gain for monsters, duration of orc battle cries and removed use of invocations to determine the success of spontaneous orc conversion.
 
 Fixed monsters getting bad experience values.
 r7294@kamatari (orig r2587):  dshaligram | 2007-10-26 07:15:09 -0400
 Fixed item_check not being called correctly (syllogism).
 r7295@kamatari (orig r2588):  j-p-e-g | 2007-10-26 07:32:57 -0400
 Fix bug 1814617: teleport/banish not clearing being trapped in net
 
 r7296@kamatari (orig r2589):  dshaligram | 2007-10-26 07:50:08 -0400
 Fixed non-friendly monsters not gaining experience (oops).
 r7298@kamatari (orig r2591):  j-p-e-g | 2007-10-26 07:56:45 -0400
 Fix remaining net bug.
 
 r7300@kamatari (orig r2593):  dshaligram | 2007-10-26 08:56:40 -0400
 No experience for summoned hostile elementals and scorpions (syllogism).
 r7301@kamatari (orig r2594):  dshaligram | 2007-10-26 09:05:22 -0400
 Backed-out redundant no-xp-for-summons change, already fixed differently by Haran.
 r7307@kamatari (orig r2600):  dshaligram | 2007-10-26 12:26:19 -0400
 Trowel card now picks vaults tagged "trowel_portal".
 r7308@kamatari (orig r2601):  dshaligram | 2007-10-26 12:32:37 -0400
 Added cset_unicode to options texts (V-Napkin), fixed staff of energy not working for transformations (syllogism).
 r7311@kamatari (orig r2604):  j-p-e-g | 2007-10-26 13:27:02 -0400
 Alternative message for "kneeling" at altars.
 
 r7313@kamatari (orig r2606):  j-p-e-g | 2007-10-26 18:38:21 -0400
 Adding two new mutations for the heck of it:
 
 * MUT_PAWS: "You have soft paws in place of feet."
 Similar to HOOVES and TALONS - incidentally, I resorted a
 few mutations for better grouping - but increases stealth.
 
 * MUT_EXTRA_EYES: grow up to three extra eyes that
 increase depth perception and thus accuracy. I'm still
 looking for a drawback to this mutation (other than looking
 weird). Also, could be related to ACUTE/BLURRY VISION 
 somehow.
 
 Breaks saves, or at least mutations.
 
 r7314@kamatari (orig r2607):  dshaligram | 2007-10-27 01:51:13 -0400
 Increased experience needed for monsters to level up, bumped orc sorcerers up one HD, and factored in XL in Beogh orc spontaneous conversion.
 r7315@kamatari (orig r2608):  dshaligram | 2007-10-27 02:13:39 -0400
 Nets should not be branded.
 r7316@kamatari (orig r2609):  dshaligram | 2007-10-27 02:42:43 -0400
 Added a space in the note taken when messages are received in dgl. Dropped hobgoblin max hp.
 r7317@kamatari (orig r2610):  dshaligram | 2007-10-27 02:50:04 -0400
 Fixed mutation array size mismatch assert.
 r7318@kamatari (orig r2611):  dshaligram | 2007-10-27 02:54:08 -0400
 [1821096] Olgreb's toxic radiance should not affect submerged monsters (dolorous).
 r7319@kamatari (orig r2612):  dshaligram | 2007-10-27 03:15:37 -0400
 [1820931] Fixed wizmode &o deck bug (doy).
 r7320@kamatari (orig r2613):  dshaligram | 2007-10-27 03:44:37 -0400
 [1821098] Fixed bat transform not conferring flight. Fixed player_is_levitating and renamed it to player_is_airborne to describe the function better.
 r7323@kamatari (orig r2616):  dshaligram | 2007-10-27 04:42:26 -0400
 Fixed monsters::is_levitating not checking randarts that provide levitation.
 r7324@kamatari (orig r2617):  dshaligram | 2007-10-27 05:47:42 -0400
 Fixed macros not working for targeting (Chilliwack).
 r7325@kamatari (orig r2618):  dshaligram | 2007-10-27 06:10:27 -0400
 Fixed !R inscription not confirming remove when only one item is worn (jarpiain).
 r7327@kamatari (orig r2620):  dshaligram | 2007-10-27 06:31:49 -0400
 Vestibule monster generation drops off quickly and approaches zero.
 r7328@kamatari (orig r2621):  dshaligram | 2007-10-27 06:51:39 -0400
 Dropped cost of Okawaru Haste.
 r7329@kamatari (orig r2622):  dshaligram | 2007-10-27 07:27:10 -0400
 Increased gift timeout for Okawaru armour gifts, made it easier to sustain piety while working off a gift timeout.
 r7330@kamatari (orig r2623):  dshaligram | 2007-10-27 07:34:28 -0400
 Okawaru and Trog gifts should not be negatively enchanted, where reasonable.
 r7331@kamatari (orig r2624):  dshaligram | 2007-10-27 07:52:27 -0400
 Weakened control demon demonspawn power (syllogism).
 r7332@kamatari (orig r2625):  dshaligram | 2007-10-27 08:45:04 -0400
 Made Xom more random, reduced chance of bad effects at low amusement levels.
 r7336@kamatari (orig r2628):  dshaligram | 2007-10-27 10:46:37 -0400
 Removed unnecessary #if UNIX lines, changed textcolor to textattr for view redraw.
 r7342@kamatari (orig r2629):  dshaligram | 2007-10-27 11:59:10 -0400
 Minor view code cleanup; this ought to fix the DOS redraw issues as well.
 r7344@kamatari (orig r2631):  nlanza | 2007-10-27 13:33:21 -0400
 Add mgrow.{cc,h} to the Xcode project.
 
 r7346@kamatari (orig r2632):  dshaligram | 2007-10-28 04:07:04 -0400
 Toned down Xom's use of demons.
 r7349@kamatari (orig r2635):  dshaligram | 2007-10-28 06:37:06 -0400
 Monsters should not gain experience for offing their friends.
 r7351@kamatari (orig r2637):  dshaligram | 2007-10-28 07:12:14 -0400
 Moved dangerous minivaults deeper (bobbens).
 r7353@kamatari (orig r2639):  j-p-e-g | 2007-10-28 10:31:57 -0400
 Changed vaults (dploog).
 
 r7354@kamatari (orig r2640):  j-p-e-g | 2007-10-28 11:15:21 -0400
 Another mutation commit. Sorry, I couldn't resist.
 
 I'm replacing the (stupid, I agree) "extra eyes" mutation 
 with the more Crawlific "shaggy fur" mutation. It currently 
 doesn't count towards the scales counter, but that could be 
 changed. Also, maybe it could replace one of the scales 
 with a similar AC bonus. Oh, and trolls start out with this 
 at level 1 because I think it fits them.
 
 Adding the percentage bonus (rarity 1) and penalty (rarity 9)
 for mana. Maybe the bonus (+10%, +20%, +30%) should be 
 abolished entirely as David suggested; for now I've left it 
 as a mutation pair.
 
 As a third change I'm including the experimental sleepiness
 mutation that makes you randomly fall asleep. Being hit, 
 loud noises and starving will make you wake up.
 
 Again, may break mutations of existing save files.
 
 ---------------------------------
 
 To answer David's question on balancing (or rather, make 
 everything more complicated, I'm afraid) I've counted 
 mutations in 0.3 and as of this commit, to compare them. 
 
 Rarity influences the chance a mutation, once randomly
 chosen, will be considered acceptable, with a chance of 
 rarity/10. Each round of trying to find an acceptable 
 mutation there's a 1/1000 chance of just giving up. 
 In brackets I will list the average probability of a 
 good/bad mutation being chosen in a given round. 
 (The difference to 100 is the chance of having to reroll.)
 
 in 0.3:
 46 good mutations of average rarity 3.2 (23.72%)
 12 bad mutations of average rarity 8 (15.47%)
 4 in-between mutations of average rarity 7 (4.51%)
 (56.3% chance of rerolling)
 
 new:
 48 good mutations of average rarity 3.1 (21.72%)
 14 bad mutations of average rarity 7.6 (15.71%)
 6 in-between mutations of average rarity 5 (4.41%)
 (58.16% chance of rerolling)
 
 By in-between mutations I mean ones with advantages and
 drawbacks, namely weak_flexible, strong_stiff, horns, 
 hooves, talons and paws. (The last four are probably seen
 as mostly negative by a lot of players due to losing an
 equipment slot.)
 
 Because of the lower rarity of the new mutations (including 
 drifting) the overall chance of _not_ receiving a mutation
 has slightly increased (1/1000 chance per reroll necessary).
 
 r7356@kamatari (orig r2642):  j-p-e-g | 2007-10-28 12:18:11 -0400
 Repairing levels for trunk. Whoops...
 
 r7358@kamatari (orig r2644):  dshaligram | 2007-10-28 14:46:28 -0400
 Transform fixes for trunk.
 r7360@kamatari (orig r2646):  dshaligram | 2007-10-28 15:29:42 -0400
 Removed "dig_this" minivault.
 r7362@kamatari (orig r2648):  dshaligram | 2007-10-29 02:27:10 -0400
 Fixed javelin base hit, dropped weight slightly.
 r7363@kamatari (orig r2649):  dshaligram | 2007-10-29 02:39:09 -0400
 Give ogres one extra rock to throw, increased preservation rates for javelins and large rocks, dropped weight of large rocks.
 r7365@kamatari (orig r2651):  dshaligram | 2007-10-29 02:52:14 -0400
 [1817715] Fixed autopickup trying to pick up nets you're caught in.
 r7367@kamatari (orig r2653):  dshaligram | 2007-10-29 03:57:57 -0400
 Tweaked -mapstat to show random maps available by depth. Added a floating dummy vault to correct probabilities of vaults in non-dungeon branches.
 r7370@kamatari (orig r2656):  dshaligram | 2007-10-29 05:50:59 -0400
 Fixed monster thrown weapon preservation rate.
 r7374@kamatari (orig r2660):  j-p-e-g | 2007-10-29 08:30:20 -0400
 Beogh conversion fixes for trunk.
 
 r7375@kamatari (orig r2661):  j-p-e-g | 2007-10-29 08:54:55 -0400
 float.des changes.
 
 r7377@kamatari (orig r2663):  dshaligram | 2007-10-29 09:20:03 -0400
 Removed obsolete "levels" option. des files to load should be specified in loadmaps.lua and nowhere else.
 r7378@kamatari (orig r2664):  dshaligram | 2007-10-29 10:01:08 -0400
 Sort maps by weight in mapgen.log output (random map listing).
 r7379@kamatari (orig r2665):  dshaligram | 2007-10-29 10:28:20 -0400
 Vault fixes + applied bobbens' levdes.vim water-colour patch.
 r7380@kamatari (orig r2666):  dshaligram | 2007-10-29 10:51:06 -0400
 Added a note on generating mapgen stats.
 r7382@kamatari (orig r2668):  dshaligram | 2007-10-29 14:08:09 -0400
 s/antennas/antennae/.
 r7384@kamatari (orig r2670):  haranp | 2007-10-29 16:13:56 -0400
 Better messages for Genie effects.
 
 r7386@kamatari (orig r2672):  dshaligram | 2007-10-30 00:16:54 -0400
 [1814784] Enable NaEE.
 r7387@kamatari (orig r2673):  dshaligram | 2007-10-30 00:37:28 -0400
 [1822251] Fixed bug in the handling of poisoned needles.
 r7388@kamatari (orig r2674):  dshaligram | 2007-10-30 00:51:24 -0400
 [1800190] Reavers get to choose starting spellbook. Moved poison level check to poison_monster.
 r7390@kamatari (orig r2676):  dshaligram | 2007-10-30 01:16:17 -0400
 Fixed extra keypress needed to navigate out of spellbook descriptions when examining books in shops (Erik).
 r7392@kamatari (orig r2678):  dshaligram | 2007-10-30 01:35:40 -0400
 Place altar to Lugonu randomly, not necessarily in LOS.
 r7395@kamatari (orig r2681):  haranp | 2007-10-30 07:17:52 -0400
 Stack Deck interface improvements.
 Incidentally, describe.cc needs to be fixed to describe marked/stacked
 decks properly.
 
 r7397@kamatari (orig r2683):  dshaligram | 2007-10-30 09:09:37 -0400
 Updated CREDITS and INSTALL, fixed Tomb:2 (David), fixed Xom's mutation-as-reward strategy.
 r7398@kamatari (orig r2684):  dshaligram | 2007-10-30 09:19:29 -0400
 Fixed Xom being amused by repeatedly zapping tried wands (like digging), tweaked messages for demon summons.
 r7399@kamatari (orig r2685):  dshaligram | 2007-10-30 09:34:53 -0400
 Wings mutation is single-level.
 r7402@kamatari (orig r2688):  dshaligram | 2007-10-30 12:02:16 -0400
 [1822636] Fixed bad handling of banishment by distortion weapon animated by Tukima's Dance.
 r7404@kamatari (orig r2690):  dshaligram | 2007-10-30 14:08:49 -0400
 Fixed mkdir call for djgpp.
 r7406@kamatari (orig r2692):  haranp | 2007-10-30 18:29:10 -0400
 'v' now describes decks properly.
 There is a small information leak: if you know (from Peek Deck) that
 the deck contains a card X somewhere, and then you draw card X which
 happens not to be the seen card X in the internal structure, you can
 still see from the 'v' output that there is another X card hiding in
 there.
 
 r7407@kamatari (orig r2693):  haranp | 2007-10-30 18:36:39 -0400
 Noted D:1} trick to search for items on dlevel 1 only [1823009]
 
 r7408@kamatari (orig r2694):  haranp | 2007-10-30 18:48:14 -0400
 Unarmed title is based on base, not modified, stats [1821727]
 
 r7409@kamatari (orig r2695):  haranp | 2007-10-30 19:01:30 -0400
 Slightly better message when zapping identifies a wand [1817031]
 
 r7411@kamatari (orig r2697):  dshaligram | 2007-10-30 22:13:19 -0400
 [1823057] Fixed explore's mimic handling.
 r7415@kamatari (orig r2701):  dshaligram | 2007-10-31 04:01:02 -0400
 s/favorite/favourite/
 r7416@kamatari (orig r2702):  haranp | 2007-10-31 07:31:12 -0400
 dec_penance() now happens after the godly wrath, not before. Fixes
 1819735.
 
 r7417@kamatari (orig r2703):  haranp | 2007-10-31 08:11:04 -0400
 Update stashes when butchery is done. Fixes 1820396.
 
 r7418@kamatari (orig r2704):  haranp | 2007-10-31 08:18:22 -0400
 ID is no longer possible on portaled projectiles. Fixes 1817777.
 
 r7419@kamatari (orig r2705):  haranp | 2007-10-31 08:49:37 -0400
 1822982: slightly better spell power string.
 
 r7420@kamatari (orig r2706):  haranp | 2007-10-31 09:31:38 -0400
 Portal no longer works once you have the Orb.
 
 r7421@kamatari (orig r2707):  haranp | 2007-10-31 09:44:57 -0400
 s/portaled/portal
 
 r7422@kamatari (orig r2708):  haranp | 2007-10-31 10:19:08 -0400
 Nagas no longer get racial weapons [1811726].
 
 r7423@kamatari (orig r2709):  haranp | 2007-10-31 10:24:18 -0400
 Changed description for weapons of distortion [1808856]
 
 r7427@kamatari (orig r2712):  j-p-e-g | 2007-11-01 07:17:45 -0400
 Corrections to tables.txt
 
 r7428@kamatari (orig r2713):  j-p-e-g | 2007-11-01 07:41:11 -0400
 Committing patch 1823611, 1822279, 1821680 and 1821019 by
 dolorous: typo fixes, mutation message fixes for black scales
 and boney plates, and fixed removal of elven M&F and dwarven
 Polearms.
 
 r7430@kamatari (orig r2715):  dshaligram | 2007-11-01 07:59:18 -0400
 Added you.good_god() and you.evil_god() to check if the player is worshipping a good/evil god. Passing a god name is optional, and will check if that god is good/evil (you.good_god("Elyvilon") == true).
 r7431@kamatari (orig r2716):  dshaligram | 2007-11-01 08:11:05 -0400
 Allow yesno to use an override keymap applied after getchm(), make Escape cancel out of the explore stop prompt (bobbens).
 r7432@kamatari (orig r2717):  dshaligram | 2007-11-01 09:22:39 -0400
 Added a brief howto for portal vaults (bobbens), removed unnecessary desc field from lm_pdesc.lua, breaks saves.
 r7433@kamatari (orig r2718):  haranp | 2007-11-01 18:52:52 -0400
 Some prayer cases which shouldn't have taken time were taking time.
 [1824174]
 
 r7434@kamatari (orig r2719):  haranp | 2007-11-01 19:03:32 -0400
 Changed order of spells in Book of Control. [1823455]
 
 r7435@kamatari (orig r2720):  haranp | 2007-11-01 19:05:37 -0400
 Fixed the other instance of Control Teleport (in Spatial Translocations.)
 
 r7436@kamatari (orig r2721):  dshaligram | 2007-11-02 02:27:40 -0400
 Applied bobbens' patch: you.skills("foo") gets skill level of foo from Lua.
 r7437@kamatari (orig r2722):  dshaligram | 2007-11-02 02:52:42 -0400
 Fixed LFLAGS not working right when conditionalised (bobbens).
 r7438@kamatari (orig r2723):  dshaligram | 2007-11-02 04:56:48 -0400
 Fixed level-map not showing column 79 if the term is 80 columns (bobbens).
 r7439@kamatari (orig r2724):  dshaligram | 2007-11-02 07:40:34 -0400
 Allow using floor="other_feature" when initialising a one-way stair, so that the stair is replaced with other_feature instead of regular floor (bobbens).
 r7440@kamatari (orig r2725):  dshaligram | 2007-11-02 09:36:20 -0400
 Fixed broken MHITNOT/MHITYOU, changed handling of DUR_SLOW to be like DUR_HASTE, reduced paralysis duration for crystal balls of fixation. MHITNOT fix breaks saves.
 r7441@kamatari (orig r2726):  dshaligram | 2007-11-02 10:22:15 -0400
 Unbreak trunk build (oops).
 r7442@kamatari (orig r2727):  dshaligram | 2007-11-02 11:05:33 -0400
 Experimental support for monster shields, needs more work for rationalising shield class for monsters with player and beam to-hit.
 r7443@kamatari (orig r2728):  haranp | 2007-11-03 06:48:49 -0400
 Minor code cleanups.
 
 r7445@kamatari (orig r2730):  haranp | 2007-11-03 08:29:53 -0400
 Added HURRY option to makefile.unix.
 Slightly changed how randart weapon/armour mimics work.
 
 r7447@kamatari (orig r2732):  haranp | 2007-11-03 09:06:10 -0400
 Fixed bug with show_beam on when self-targeting without ever moving the
 direction cursor. [1812562]
 
 r7452@kamatari (orig r2737):  dshaligram | 2007-11-03 12:05:59 -0400
 Removed remaining traces of travel_colour (David).
 r7454@kamatari (orig r2739):  dshaligram | 2007-11-03 12:16:43 -0400
 Restrict aerie to main-dungeon-only.
 r7456@kamatari (orig r2741):  dshaligram | 2007-11-03 12:37:50 -0400
 Updated release build (DOS+Windows) script for 0.3.
 r7462@kamatari (orig r2745):  haranp | 2007-11-03 15:42:38 -0400
 Refix for direction(): prev_target should work now.
 
 r7465@kamatari (orig r2748):  dshaligram | 2007-11-04 09:16:55 -0500
 Killing-blow damage was not being saved to logfile, fixed.
 r7466@kamatari (orig r2749):  j-p-e-g | 2007-11-04 10:53:36 -0500
 Nets that hold you cannot be destroyed by Ely's Destroy Weapon ability.
 (Fix  1825520).
 
 Monsters will be held in nets longer. Doesn't influence time needed to 
 destroy it, so ogres and such will still get out quickly. Needs more 
 testing, I guess.
 
 Intelligent friendlies will try to avoid traps you (the player) know
 about, and the chance for triggering known blade and net traps is
 much lower. Also, friendly casters are much less likely to spam you with
 "spells" if there are no enemies around.
 
 r7469@kamatari (orig r2752):  j-p-e-g | 2007-11-04 14:15:23 -0500
 Make autoexplore stop when orcs convert to Beogh.
 
 r7470@kamatari (orig r2753):  j-p-e-g | 2007-11-04 15:19:28 -0500
 Renaming Portal Vaults to Bazaars. [FR 1824984]
 Fix 1825526: not stepping into deep water costing a turn
 Fix 1825352: ?torment only being unholy if it wasn't known
 
 r7472@kamatari (orig r2755):  haranp | 2007-11-04 16:11:19 -0500
 Pluralise "knife" correctly (to "knives") [1825553]
 
 r7473@kamatari (orig r2756):  j-p-e-g | 2007-11-04 17:14:50 -0500
 FR 1821775: While held in a net, you can fire blowguns, though there's
 a penalty similar to the one when wearing a buckler and accuracy is
 lowered. I'm not sure about the numbers - they'll have to be tweaked a
 bit, I guess.
 Also fix possibility to drift out of net.
 
 r7474@kamatari (orig r2757):  ennewalker | 2007-11-04 17:43:49 -0500
 Fixing typo in manual.  (Thanks, AlexMax.)
 r7478@kamatari (orig r2758):  dshaligram | 2007-11-05 01:33:43 -0500
 Updated CREDITS.
 r7479@kamatari (orig r2759):  haranp | 2007-11-05 03:31:39 -0500
 Vault fixes (David)
 
 r7481@kamatari (orig r2761):  haranp | 2007-11-05 03:47:20 -0500
 Removed CHANCE line (oops)
 
 r7484@kamatari (orig r2764):  j-p-e-g | 2007-11-05 04:05:35 -0500
 latest net fixes (Nemelex prayer, swapping with friendlies) for trunk
 
 r7485@kamatari (orig r2765):  haranp | 2007-11-05 05:28:43 -0500
 Incorporate patches 1825023 (typos) and 1824868 (bug in fully_contains().)
 
 r7487@kamatari (orig r2767):  haranp | 2007-11-05 05:50:57 -0500
 Fixed 1825223: unknown curses don't leak information in prices.
 
 r7489@kamatari (orig r2769):  j-p-e-g | 2007-11-05 09:19:39 -0500
 Net fix (reduced trapping turns) also for trunk.
 
 r7491@kamatari (orig r2771):  j-p-e-g | 2007-11-05 11:07:44 -0500
 Correct tables.txt and add wizard mode to version information.
 
 r7493@kamatari (orig r2773):  j-p-e-g | 2007-11-05 11:53:54 -0500
 claw mutation fix for net damage, courtesy of dolorous
 
 r7495@kamatari (orig r2775):  j-p-e-g | 2007-11-06 06:51:01 -0500
 Corrections to manual (patch by maiermirk) and 
 fix to freeing self from net.
 
 r7496@kamatari (orig r2776):  haranp | 2007-11-06 12:35:30 -0500
 Geryon can now fly.
 
 r7497@kamatari (orig r2777):  haranp | 2007-11-06 18:46:55 -0500
 Massive rewrite of makeitem.cc. Might be buggy.
 Fixed some old bugs, e.g. double reroll of =oCT.
 items() now respects force_type more often. As a side effect, acquirement is
 less likely to give randart jewellery or armour.
 
 r7498@kamatari (orig r2778):  haranp | 2007-11-07 05:32:26 -0500
 Fix for 1827415: handle_time()-induced banishments (e.g. Hell miscasts)
 were being applied one turn too late.
 
 r7500@kamatari (orig r2780):  haranp | 2007-11-07 09:19:45 -0500
 s/liquid/barnacled/
 
 r7503@kamatari (orig r2783):  j-p-e-g | 2007-11-07 09:37:54 -0500
 latest net improvement (make switching damage -> escape rarer) for trunk
 
 r7504@kamatari (orig r2784):  haranp | 2007-11-07 13:20:00 -0500
 Reorganized Metamorphosis, batform now impossible.
 
 r7506@kamatari (orig r2786):  haranp | 2007-11-07 13:26:31 -0500
 Merged r2729 (morgue dir creation) from 0.3.
 
 r7507@kamatari (orig r2787):  haranp | 2007-11-07 13:50:27 -0500
 Slightly compressed 'v' descriptions. Should fix 1826265.
 
 r7509@kamatari (orig r2789):  haranp | 2007-11-07 14:00:38 -0500
 Blocked some useless spells for Vampires and Ghouls. [1827689]
 
 r7511@kamatari (orig r2791):  haranp | 2007-11-07 14:10:55 -0500
 Runes no longer need ID [1826900]
 
 r7514@kamatari (orig r2794):  haranp | 2007-11-07 14:50:44 -0500
 Merged r2793 (better ability descriptions for Nemelex)
 
 r7515@kamatari (orig r2795):  haranp | 2007-11-07 15:06:07 -0500
 pray() prompt respects macros (V-Napkin)
 
 r7517@kamatari (orig r2797):  haranp | 2007-11-07 15:13:08 -0500
 Refix pray() fix.
 
 r7519@kamatari (orig r2799):  haranp | 2007-11-07 15:25:52 -0500
 Monochromatized spell power bars.
 
 r7521@kamatari (orig r2801):  haranp | 2007-11-07 16:05:52 -0500
 Cancelling 'E'voking a reaching weapon shouldn't cost anything.
 
 r7522@kamatari (orig r2802):  ennewalker | 2007-11-07 22:46:17 -0500
 Randarts with no mods get one of (ac, ev, str, int, dex.) [1826417]
 r7525@kamatari (orig r2804):  haranp | 2007-11-08 05:42:41 -0500
 Enslaved fleeing monsters now flee towards you, not away from you.
 Hopefully fixes 1828086.
 
 r7527@kamatari (orig r2806):  haranp | 2007-11-08 05:59:12 -0500
 Integrated patch 1828014 (spell order).
 Also unbroke trunk build. Oops.
 
 r7529@kamatari (orig r2808):  haranp | 2007-11-08 06:04:21 -0500
 Typo fixes (dolorous, 1827992)
 
 r7530@kamatari (orig r2809):  haranp | 2007-11-08 10:37:55 -0500
 1822496: saprovore mutation shouldn't be given except at birth.
 
 r7531@kamatari (orig r2810):  haranp | 2007-11-08 11:04:50 -0500
 Some cleanup of evoke_wielded(), more to come.
 
 r7532@kamatari (orig r2811):  j-p-e-g | 2007-11-08 11:10:47 -0500
 Fix to intelligent friendlies avoiding traps. It actually works now. :)
 
 r7533@kamatari (orig r2812):  haranp | 2007-11-08 11:13:34 -0500
 Fix critical bug (in trunk only) with Shift-diring directional spells
 and show_beam set. (It would always go down.)
 
 r7534@kamatari (orig r2813):  haranp | 2007-11-08 11:32:01 -0500
 Fix 1824176: firing will now only ask for confirmation when you actually
 fire.
 
 r7536@kamatari (orig r2815):  haranp | 2007-11-08 11:55:18 -0500
 Fix for 1826891: x-examination reveals secret doors masquerading as
 non-rock walls. They will now masquerade (to 'x') as walls of whatever type
 is nearby.
 
 r7538@kamatari (orig r2817):  haranp | 2007-11-08 12:29:39 -0500
 Better secret door hiding (Darshan)
 
 r7540@kamatari (orig r2819):  haranp | 2007-11-08 12:51:18 -0500
 Handle tabs properly in Windows.
 
 r7542@kamatari (orig r2821):  haranp | 2007-11-08 13:02:01 -0500
 Fixed 1828326 (eol style on text files)
 
 r7543@kamatari (orig r2822):  haranp | 2007-11-08 13:17:54 -0500
 Added map dumping (to NAME.map) to the '#' key. The map dump doesn't
 include the hero (i.e., no '@' symbol.)
 
 r7544@kamatari (orig r2823):  haranp | 2007-11-08 13:30:21 -0500
 Better map dumping (Darshan)
 
 r7545@kamatari (orig r2824):  haranp | 2007-11-08 13:31:51 -0500
 Gah, yet another minor bugfix to dump_map (third time's the charm)
 
 r7555@kamatari (orig r2829):  haranp | 2007-11-09 08:17:07 -0500
 Draconian fighter fix for trunk.
 
 r7556@kamatari (orig r2830):  haranp | 2007-11-09 08:27:57 -0500
 Patch 1828418: fixed all weapons being generated badly (dolorous)
 
 r7557@kamatari (orig r2831):  j-p-e-g | 2007-11-09 11:01:49 -0500
 Another step on the way to smarter monsters, again on the topic of
 trap handling.
 
 Changes:
 * intelligent monsters native to a branch (elves in Elven Halls etc.)
   will try not to step on traps
 * highly intelligent monsters have a chance to avoid traps as well
 * intelligent monsters use an estimate of the expected damage of a
   trap (simple randomized amount) to decide whether to cross it
   I've left the half hpmax check in as well because... um, for 
   historical reasons?
 
 r7558@kamatari (orig r2832):  dshaligram | 2007-11-09 11:20:05 -0500
 [1828918] Fixed shadow creatures producing permanent summons.
 r7559@kamatari (orig r2833):  dshaligram | 2007-11-09 12:42:56 -0500
 [1829067] Fixed mephitic cloud not setting enchantment owner correctly on affected monsters.
 r7562@kamatari (orig r2835):  zelgadis | 2007-11-09 20:33:31 -0500
 A cloud's spread rate now undergoes exponential decay as the cloud
 spreads.
 
 r7566@kamatari (orig r2838):  haranp | 2007-11-10 19:29:28 -0500
 Allow potions to be generated randomly (oops...)
 
 r7567@kamatari (orig r2839):  j-p-e-g | 2007-11-11 11:29:05 -0500
 Implementing FR 1829063: warning when putting on/removing items
 with a stat property that will be fatal.
 
 r7568@kamatari (orig r2840):  haranp | 2007-11-11 15:40:56 -0500
 Don't trim menu_colours [1829940].
 Removed a lot of dead code and fixed some minor bugs in wanderer generation.
 
 r7569@kamatari (orig r2841):  haranp | 2007-11-11 17:16:19 -0500
 Removed brand from blowgun of the Assassin [1829597]
 
 r7570@kamatari (orig r2842):  haranp | 2007-11-11 17:44:16 -0500
 Added a message for Forescry renewal (if Condensation Shield gets it,
 Forescry should too) [1829000]
 Removed a whole lot of dead code; the place for dead code is in the
 svn repository, not the compilation unit.
 
 r7576@kamatari (orig r2843):  zelgadis | 2007-11-12 01:09:15 -0500
 Lua map markers can now be generated in C code from
 map_lua_marker::parse_marker() by prefixing the Lua string with "lua_mapless:"
 rather than "lua:".
 
 Fog machines can be created and placed from within C code via
 place_fog_machine().
 
 r7577@kamatari (orig r2844):  haranp | 2007-11-13 04:31:47 -0500
 Corpses don't need identification [1830717]
 
 r7578@kamatari (orig r2845):  haranp | 2007-11-13 05:27:08 -0500
 Fog now makes poison and steam (5% chance of each) instead of the old
 10% chance for miasma (Erik.)
 
 r7579@kamatari (orig r2846):  zelgadis | 2007-11-13 07:33:41 -0500
 The number of traps randomly generated on a level, and which types of
 traps are randomly selected, can now easily be controlled on a branch by
 branch basis (and for Pan and the Abyss), similar to how monster level
 and rarity is controlled (via function pointers in the Branch data
 structure).  The same can be done for fog machines (though this feature
 isn't being used as of yet).
 
 r7580@kamatari (orig r2847):  haranp | 2007-11-13 07:37:07 -0500
 'q' (or Escape) when prompted for food on the floor now cancels out of
 eating completely, rather than moving to inventory.
 
 r7581@kamatari (orig r2848):  haranp | 2007-11-13 07:57:26 -0500
 Better Returning description [1830132]
 
 r7582@kamatari (orig r2849):  j-p-e-g | 2007-11-13 10:57:55 -0500
 * Add Cannibalism to list of forbidded actions for good gods.
 * Add simple warning message (god "did not appreciate that!")
   when using unID'd items that would otherwise be penalized.
 * Change protection from harm to be independent of prayer.
 
 r7583@kamatari (orig r2850):  haranp | 2007-11-13 12:49:42 -0500
 Bunch of changes:
 Removed unnecessary static_casts<> from branch.cc, improved messages a bit.
 Removed incorrect caps from entomb().
 Changed ornate/legendary bonuses from percentages to flat power bonuses
 (+150 and +300 respectively.)
 Ensured at least one Nemelex gift by the time you get the first power.
 Changed probability of Nemelex liking a gift, made it dependent on
 piety.
 Fix warning in cloud.cc.
 
 r7584@kamatari (orig r2851):  haranp | 2007-11-13 13:55:53 -0500
 Made Tome of Destruction more consistent for those with high Evoc.
 Made manuals visibly different from spellbooks. Also, you can't
 cancel reading a manual; so you risk wasting it if you read all
 unIDed books.
 
 r7585@kamatari (orig r2852):  haranp | 2007-11-13 14:26:05 -0500
 Dissection no longer requires confirmation if there is only one corpse
 on the square.
 
 r7586@kamatari (orig r2853):  j-p-e-g | 2007-11-14 17:17:44 -0500
 s/Ogre Mage/Ogre-Mage
 and beholding should not allow swapping with friendlies (Bug 1739619).
 
 r7588@kamatari (orig r2855):  dshaligram | 2007-11-15 06:11:04 -0500
 Fixed stash-tracker seeing through walls (it was using stale LOS after blink/teleport), fixed shadow creatures crash in labyrinths, and fixed use of displayed stair glyph for handling selection of monsters placed on stairs (display glyphs can be changed by the user).
 r7590@kamatari (orig r2857):  haranp | 2007-11-15 17:06:31 -0500
 Added an option, always_confirm_butcher.
 
 r7591@kamatari (orig r2858):  zelgadis | 2007-11-16 03:18:15 -0500
 M_AMPHIBIOUS now means both "land creature can swim through deep water"
 *and* "deep water creature can walk on land".
 
 Most of the supporting features neccessary for the "earth worm" FR
 [1766532] have been implemented, except for "fleeing towards walls".
 However, no work has yet been done to update the monster AI to
 work well when a monster is fighting an earth worm.
 
 r7592@kamatari (orig r2859):  haranp | 2007-11-16 03:52:19 -0500
 Removed: safe_autopickup, safe_zero_exp, lowercase_invocations,
 always_greet, terse_hand, increasing_skill_progress, use_notes,
 confirm_self_target. (default_autoprayer still exists.)
 
 r7593@kamatari (orig r2860):  haranp | 2007-11-16 04:29:27 -0500
 Added Crusade card: conversion/abjuration effect.
 
 r7594@kamatari (orig r2861):  dshaligram | 2007-11-17 09:05:30 -0500
 Updated CREDITS.
 r7596@kamatari (orig r2863):  dshaligram | 2007-11-17 13:28:35 -0500
 Fixed buggy Xom mutation handling.
 r7598@kamatari (orig r2865):  dshaligram | 2007-11-17 13:56:43 -0500
 Fixed bad shadow creatures summons when climbing with the Orb (bobbens).
 r7600@kamatari (orig r2867):  dshaligram | 2007-11-18 05:08:39 -0500
 [1833936] Fixed ASSERT in monster blink checks.
 r7601@kamatari (orig r2868):  dshaligram | 2007-11-18 05:33:01 -0500
 [1833959] Fixed broken digging beams.
 r7602@kamatari (orig r2869):  dshaligram | 2007-11-18 05:36:11 -0500
 Kill hard tabs.
 r7603@kamatari (orig r2870):  j-p-e-g | 2007-11-18 19:44:33 -0500
 Fix a net bug that was responsible for never (!) entrapping monsters. Whoops...
 Also autoID a weapon of returning the player actually sees returning. 
 (Bug 1830129)
 
 r7605@kamatari (orig r2872):  j-p-e-g | 2007-11-19 09:08:58 -0500
 A number of tutorial improvements, including reintroducing info on spellbooks.
 Also:
 Fix 1832819. (Horn mutation not making helmet slot show as "restricted")
 Fix 1831983. (Autobutcher now ignores weapons inscribed with !w)
 
 r7607@kamatari (orig r2874):  j-p-e-g | 2007-11-19 19:14:41 -0500
 Clean-up of options in init.txt and crawl_options.txt 
 courtesy of maiermirk (1829976, 1831190).
 
 This includes a lot of spacing changes, updates of
 some examples and moving around some options into more
 sensible groupings.
 
 Highlights:
 * add returning weapons to fire_order list
   and allow fire_order to use += on new lines
   (This should solve the second part of 1829475.)
 * heap_brand now defaults to "reverse"
 * detected_item_colour defaults to green
 
 Also s/artifact/artefact.
 
 r7609@kamatari (orig r2876):  ennewalker | 2007-11-19 22:28:50 -0500
 Extraneous up stairs on dungeon level 1 are confusing to new users.  Removing the generation of extra up stairs there.
 r7610@kamatari (orig r2877):  dolorous | 2007-11-19 22:35:47 -0500
 Add various patches of mine:
 
 [1824221] don't give Yred-worshipping demonspawn the "raise dead" mutation
 [1829258] remove wrongly hardcoded exp-draining resistance for undead
 [1829691] typo fixes
 [1830030] clean up random god servant handling
 [1829890] fix divine retribution messages, generalize berserker summoning
 
 r7611@kamatari (orig r2878):  dolorous | 2007-11-19 23:27:38 -0500
 check for ghouls' eating ghouls in is_player_same_species()
 
 r7612@kamatari (orig r2879):  dolorous | 2007-11-20 00:16:17 -0500
 since Yred's "Animate Corpse" ability can overlap with the "raise dead" 
 demonspawn mutation to an extent, don't allow Yred-worshipping 
 demonspawn to get it regardless of piety
 
 r7614@kamatari (orig r2881):  dolorous | 2007-11-20 01:27:45 -0500
 for consistency, tweak Vehumet's starting message to mention his name
 
 r7615@kamatari (orig r2882):  dshaligram | 2007-11-20 07:19:31 -0500
 Fall back to ASCII if Unicode locale is unavailable (Guus). Also queue up startup error messages and display them before the newgame screen instead of emitting them to stderr.
 r7616@kamatari (orig r2883):  dshaligram | 2007-11-20 07:28:36 -0500
 Fix gcc optimising away overflow check (Guus).
 r7617@kamatari (orig r2884):  j-p-e-g | 2007-11-20 07:36:35 -0500
 A few changes to shafts:
 * shafts cannot be created above level 3 in the main dungeon
 * intelligent fleeing monsters will jump into shafts
   -> this will reveal the shaft to the player
 * rename "shaft trap" to "shaft"
 * ask for confirmation before stepping into a shaft
 
 Also finally fix colour from post-death inventory bleeding into
 the highscore and prompt. (This has always bugged me.)
 
 r7618@kamatari (orig r2885):  dshaligram | 2007-11-20 08:36:42 -0500
 Allow UNICODE_LOCALE=. in makefile.unix to specify a setlocale(LC_ALL,"") call instead of forcing a specific locale (adapted from Guus' Debian patch). Also fixed some makefile.unix checks to strip variables that are prone to trailing spaces.
 r7619@kamatari (orig r2886):  dolorous | 2007-11-20 12:27:27 -0500
 expand the special case for kobold fighters (leather armor, darts, etc.) 
 to include halfling and gnome fighters too, as they have similar 
 aptitudes; plus, they're worse with Armour skill than kobolds, so 
 getting the fighter default of scale mail is disadvantageous
 
 r7620@kamatari (orig r2887):  ennewalker | 2007-11-21 00:11:31 -0500
 Fixing [1832064] stair bug.  Added a cleanup function to ensure that there is at most one stone stair of each type on the level.
 r7621@kamatari (orig r2888):  j-p-e-g | 2007-11-21 08:29:21 -0500
 Finally include Ely piety gain from Destroy Weapon depending on
 both current piety and item value. (Only in 0.3 up to now. Whoops.)
 And make "evil" weapons (demonic, vampiric, pain, draining) always
 give piety when destroyed. (FR1832851)
 
 r7622@kamatari (orig r2889):  dolorous | 2007-11-21 09:19:35 -0500
 [1829667]: use c_getch() to get input for all the new-game menus, since 
 they only get CK_* values (which c_getch(), but not getch(), returns 
 under Unix) and single-byte characters (which c_getch() and getch() can 
 handle as well as get_ch()); this is untested under Windows, but it 
 should work, since the tutorial code uses the same technique
 
 r7623@kamatari (orig r2890):  dolorous | 2007-11-21 20:40:14 -0500
 make player::has_claws() return an int indicating the level of claws 
 available; this removes the need for some special cases dealing with 
 trolls' and ghouls' built-in claws
 
 r7624@kamatari (orig r2891):  dolorous | 2007-11-21 21:36:43 -0500
 make player::has_claws() and player::has_usable_claws() take a bool 
 indicating whether claws from transformations should be taken into 
 account; this removes the need for more special cases dealing with 
 trolls' and ghouls' built-in claws
 
 r7625@kamatari (orig r2892):  dolorous | 2007-11-21 23:05:26 -0500
 Add minor cleanups of divine protection from harm:
 
 * move the list of gods that do it into the function 
   god_protects_from_harm(), instead of hardcoding the list in two places
 * update the description of it, both in the code and the surrounding 
   comments, since it no longer depends on prayer, and since it can now 
   happen with piety less than 30
 
 r7627@kamatari (orig r2893):  j-p-e-g | 2007-11-22 07:07:18 -0500
 Don't put players under penance for harming friendlies (or holy monsters)
 by reading an unID'd ?immolation (1834837). You will still lose piety for 
 such an action, though.
 
 r7628@kamatari (orig r2894):  ennewalker | 2007-11-22 09:50:10 -0500
 Fixing assertion in monsters::pickup_armour when forcibly giving monsters unsupported equipment.
 r7629@kamatari (orig r2895):  ennewalker | 2007-11-22 11:08:27 -0500
 Fixing assertion from SUMMON_DRAKES trying to fire an invalid bolt.


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

1 files changed, 744 insertions, 688 deletions

diff --git a/crawl-ref/docs/crawl_options.txt b/crawl-ref/docs/crawl_options.txt
index 7ff415d19c..a69309f5ad 100644
--- a/crawl-ref/docs/crawl_options.txt
+++ b/crawl-ref/docs/crawl_options.txt
@@ -1,8 +1,8 @@
-This document explains all of the options in the latest version of Dungeon 
-Crawl Stone Soup. These options are set in the init.txt file located in the 
-Crawl directory (the directory containing crawl.exe on Windows and DOS). On
-Unix systems, you need to set options in the ~/.crawlrc file (a file named 
-.crawlrc in your home directory).
+This document explains all of the options in the latest version of 
+Dungeon Crawl Stone Soup. These options are set in the init.txt file 
+located in the Crawl directory (the directory containing crawl.exe on 
+Windows and DOS). On Unix systems, you need to set options in the 
+~/.crawlrc file (a file named .crawlrc in your home directory).
 
 The contents of this text are:
 
@@ -14,24 +14,23 @@ The contents of this text are:
                 crawl_dir, morgue_dir, save_dir, sound
 3-  Lua files.
                 lua_file,
-                base.lua, stash.lua, wield.lua, kills.lua, runrest.lua, 
-                gearset.lua, eat.lua, pickup.lua, trapwalk.lua
+                base.lua, stash.lua, wield.lua, kills.lua, 
+                runrest.lua, gearset.lua, eat.lua, pickup.lua, 
+                trapwalk.lua
 4-  Interface. 
 4-a     Dropping and Picking up.
                 autopickup, autopickup_exceptions, default_autopickup,
-                safe_autopickup, autopickup_no_burden, safe_zero_exp,
-                pickup_thrown, pickup_dropped, assign_item_slot,
-                drop_mode, pickup_mode, drop_filter
+                autopickup_no_burden, pickup_thrown, pickup_dropped,
+                assign_item_slot, drop_mode, pickup_mode, drop_filter
 4-b     Targeting. 
                 target_zero_exp, target_oos, target_los_first,
-                confirm_self_target, default_target,
-                target_unshifted_dirs
+                default_target, target_unshifted_dirs
 4-c     Passive Sightings (Detection and Remembrance).
                 detected_monster_colour, detected_item_colour, 
                 remembered_monster_colour, colour_map, clean_map
 4-d     Branding (Item and Monster Highlighting).
-                heap_brand, friend_brand, stab_brand, may_stab_brand,
-                stair_item_brand, trap_item_brand
+                friend_brand, stab_brand, may_stab_brand,
+                heap_brand, stair_item_brand, trap_item_brand
 4-e     Level Map Functions.
                 level_map_cursor_step, level_map_title, item_colour
 4-f     Viewport Display Options.
@@ -41,33 +40,32 @@ The contents of this text are:
                 scroll_margin
 4-g     Travel and Exploration. 
                 travel_delay, travel_avoid_terrain,
-                travel_stop_message, explore_greedy, explore_stop,
-                runrest_ignore_message, runrest_ignore_poison,
-		runrest_ignore_monster,
-                trapwalk_safe_hp, tc_reachable,
-                tc_dangerous, tc_excluded, tc_exclude_circle
+                explore_greedy, explore_stop, tc_reachable,
+                tc_dangerous, tc_excluded, tc_exclude_circle,
+                travel_stop_message, runrest_ignore_message,                    
+                runrest_ignore_poison, runrest_ignore_monster,
+                trapwalk_safe_hp 
 4-h     Stashes.
                 stash_tracking, stash_filter
 4-i     Command Enhancements.
-                auto_list, lowercase_invocations, easy_open, easy_butcher, 
-                easy_unequip, easy_confirm, easy_quit_item_prompts, 
-                easy_exit_menu, default_autoprayer, sort_menus
+                auto_list, easy_open, easy_unequip, easy_confirm, 
+                easy_butcher, always_confirm_butcher,
+                easy_quit_item_prompts, easy_exit_menu, 
+                default_autoprayer, sort_menus
 4-j     Message and Display Improvements.
-                hp_warning, mp_warning, hp_colour, mp_colour, always_greet,
-                terse_hand, delay_message_clear, menu_colour,
-                menu_colour_prefix_id, menu_colour_prefix_class
-                message_colour, increasing_skill_progress,
+                hp_warning, mp_warning, hp_colour, mp_colour,
+                delay_message_clear, message_colour,
                 show_inventory_weights, show_turns, show_beam,
-                item_stack_summary_minimum
+                item_stack_summary_minimum, menu_colour, 
+                menu_colour_prefix_id, menu_colour_prefix_class
 4-k     Missiles.
                 fire_items_start, fire_order
 4-l     Message Channels.
                 plain, prompt, god, pray, duration, danger, food, warning,
                 recovery, talk, talk_visual, intrinsic_gain, mutation,
-                monster_spell, monster_enchant, monster_damage, rotten_meat,
-                equipment, floor, multiturn, examine, examine_filter,
-                diagnostics, tutorial
-
+                monster_spell, monster_enchant, monster_damage, 
+                rotten_meat, equipment, floor, multiturn, examine, 
+                examine_filter, diagnostics, tutorial
 4-m     Inscriptions.
                 autoinscribe
 4-n     Macro related Options.
@@ -77,14 +75,15 @@ The contents of this text are:
                 kill_map, dump_kill_places, dump_item_origins, 
                 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, 
-                note_messages, note_all_spells
+                note_items, note_monsters, ood_interesting, 
+                note_hp_percent, note_skill_levels, 
+                note_all_skill_levels, note_skill_max, note_all_spells,
+                note_messages
 6-  Miscellaneous.
 6-a     All OS.
-                macro_meta_entry, mouse_input, wiz_mode, colours,
-                char_set, cset_ascii, cset_ibm, cset_dec, cset_unicode,
-                feature, mon_glyph, classic_item_colours
+                macro_meta_entry, mouse_input, wiz_mode, use_ascii,
+                classic_item_colours, colours, char_set, cset_ascii, 
+                cset_ibm, cset_dec, cset_unicode, feature, mon_glyph
 6-b     DOS and Windows.
                 dos_use_background_intensity
 6-c     Unix
@@ -131,46 +130,49 @@ For long option names, you can define option aliases by doing:
 For instance, you can use:
     ae := autopickup_exceptions
 and thereafter use "ae" instead of "autopickup_exceptions":
-    ae = >decay, >degeneration
+    ae = >uselessness, >inaccuracy
+
+If you get stuck or some things just won't seem to work properly, 
+please ask for help on the newsgroup rec.games.roguelike.misc. Please 
+flag queries with '-crawl-', as other roguelikes are also discussed 
+there.
 
-If you get stuck or some things just won't seem to work properly, please ask 
-for help on the newsgroup rec.games.roguelike.misc. Please flag queries with 
-'-crawl-', as other roguelikes are also discussed there.
 
 1-  Starting Screen.
 ====================
 
-The following options are a convenience to help you quickly start your game of
-Crawl.
+The following options are a convenience to help you quickly start your 
+game of Crawl.
 
 name = Delilah
         If set, that's the name all your Crawl characters will get. 
 
-remember_name = false
-        Crawl remembers the options (class, race etc.) you used to create your
-        last character. You may recycle them in the starting screen for a new 
-        character. If this option is set to true, Crawl will also remember the 
-        last name you used.
+remember_name = true
+        Crawl remembers the options (class, race etc.) you used to 
+        create your last character. You may recycle them in the 
+        starting screen for a new character. If this option is set to 
+        true, Crawl will also remember the last name you used.
 
-        If you use this option and want to enter a name _after_ choosing your
-        race and class, you must enter . at the initial name prompt - hitting
-        Enter at the name prompt will simply reuse your old name if
-        remember_name is set.
+        If you use this option and want to enter a name _after_ 
+        choosing your race and class, you must enter . at the initial 
+        name prompt - hitting Enter at the name prompt will simply 
+        reuse your old name if remember_name is set.
         
 weapon = (random | short sword | hand axe | spear | mace | trident)
-        Specifying the weapon option allows you to bypass the weapon selection
-        screen.  Note that tridents are restricted to only merfolk and
-        gladiators, but you'll get the standard query in illegal cases.
+        Specifying the weapon option allows you to bypass the weapon 
+        selection screen.  Note that tridents are restricted to only 
+        merfolk and gladiators, but you'll get the standard query in 
+        illegal cases.
 
 book = (flame | fire | ice | cold | summ | summoning | random)
-        Several spellcasting classes can choose their starting spellbook. 
-        Note flame=fire and ice=cold and summ=summoning.
+        Several spellcasting classes can choose their starting 
+        spellbook. Note flame=fire and ice=cold and summ=summoning.
 
 chaos_knight = (Xom | Makhleb | random)
 
 death_knight = (necromancy | Yredelemnul | random)
 
-priest       = (Zin | Yredelemnul | Beogh | random)
+priest = (Zin | Yredelemnul | Beogh | random)
         The above three make in advance the additional choices for 
         Chaos Knights, Death Knights, and Priests (Beogh for HO only).
 
@@ -182,33 +184,33 @@ class = (Fighter |...| Wanderer | random)
 
 random_pick = false
         The random_pick option will randomly generate a character.
-        The above options (weapons and class options) will override where
-        appropriate.
+        The above options (weapons and class options) will override 
+        where appropriate.
 
 
 2-  File System.
 ================
 
 crawl_dir = <path>
-        Directory for reading macro.txt and init.txt, and dumping characters.
+        Directory for reading macro.txt. 
         It should end with the path delimiter.
 
 morgue_dir = morgue
-        Directory where morgue dumps (morgue*.txt and morgue*.lst) files are
-        written.
+        Directory where morgue dumps files (morgue*.txt and 
+        morgue*.lst) as well as character dumps files are written.
 
 save_dir = saves
-        Directory where saves and bones are stored. This option may be ignored
-        depending on the settings used to compile Crawl, but should be
-        honoured for the official Crawl binaries.
+        Directory where saves and bones are stored. This option may be 
+        ignored depending on the settings used to compile Crawl, but 
+        should be honoured for the official Crawl binaries.
 
 sound = <regex>:<path to sound file>
-        Plays the sound file if a message contains regex. The regex should 
-        not include commas or colons. For example
-          sound = LOW HITPOINT WARNING:sound\sounds2\danger3.wav
+        Plays the sound file if a message contains regex. The regex 
+        should not include commas or colons. For example
+             sound = LOW HITPOINT WARNING:sound\sounds2\danger3.wav
         Getting appropriate sound files may be difficult. Check other
-        roguelikes or old computer RPGs. Alternatively, ask for help in
-        the newsgroup rec.games.roguelike.misc.
+        roguelikes or old computer RPGs. Alternatively, ask for help 
+        in the newsgroup rec.games.roguelike.misc.
 
 
 3-  Lua files.
@@ -225,22 +227,27 @@ Lua files are included using the lua_file option (one file per line):
 lua_file = <path/name.lua>
 
 The available stock Lua scripts are
-  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. Similarly, you can use 'altar',
-                   'portal' etc. Also, you can look for spellbooks ('book'),
-                   artifacts ('artifact'), and ego items ('ego'). 
+  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. Similarly, 
+                   you can use 'altar','portal' etc. Also, you can look 
+                   for spellbooks ('book'), artefacts ('artefact'), and 
+                   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)
-  runrest.lua   -- allows overriding certain stop conditions when running
-                   New options: runrest_ignore_poison, runrest_ignore_message,
-		   runrest_ignore_monster
-  gearset.lua   -- provides commands for switching of complete sets via macro
+                   currently gives three lists (Vanquished, Friendly, 
+                   Others)
+  runrest.lua   -- allows overriding certain stop conditions when 
+                   running
+                   New options: runrest_ignore_poison, 
+                   runrest_ignore_message, runrest_ignore_monster
+  gearset.lua   -- provides commands for switching of complete sets via 
+                   macro
                    New macroable functions: rememberkit, swapkit
   eat.lua       -- prompts to eat chunks in inventory.
   pickup.lua    -- smarter autopickup.
-  trapwalk.lua  -- allows travel to cross certain traps if you have enough HP.
+  trapwalk.lua  -- allows travel to cross certain traps if you have 
+                   enough HP.
 
 Also see section 7 on inline Lua fragments.
 
@@ -264,151 +271,145 @@ autopickup = $?!+"/%
         + or :  Books
         \ or |  Staves
         0       Orbs
-        }       Misc items
+        }       Misc. items
         X       Corpses
         $       Gold
         Note that _whether_ items are picked up automatically or not, is 
-        controlled by the in-game toggle Ctrl-A. Also note that picking up
-        takes a turn, but only one turn (regardless of the number of items).
-        If you teleport or blink onto a square with interesting items, these
-        will not be picked up.
+        controlled by the in-game toggle Ctrl-A. Also note that picking 
+        up takes a turn, but only one turn (regardless of the number of 
+        items). If you teleport or blink onto a square with interesting 
+        items, these will not be picked up.
 
 autopickup_exceptions = <pickup-regex, >don't-pickup-regex, ...
-        A set of regexes that force matching items to be picked up (if prefixed
-        with <), or never picked up (if prefixed with >). Excludes (>) take
-        precedence over includes (<), so if the same item is matched by both
-        an exclude and an include, it will not be subject to autopickup.
+        A set of regexes that force matching items to be picked up (if 
+        prefixed with <), or never picked up (if prefixed with >). 
+        Excludes (>) take precedence over includes (<), so if the same 
+        item is matched by both an exclude and an include, it will not 
+        be subject to autopickup.
 
         An example:
-          autopickup_exceptions = <curare-tipped needle
-        Forces autopickup to grab all curare-tipped needles, even if missiles 
-        are not set in the "autopickup" option.
+             autopickup_exceptions = <curare-tipped needle
+        Forces autopickup to grab all curare-tipped needles, even if 
+        missiles are not set in the "autopickup" option.
 
-        Whitespace between <> and the match expression is significant, so this
-        is a mistake:
-          autopickup_exceptions = <   ebony casket
+        Whitespace between <> and the match expression is significant, 
+        so the following won't work:
+             autopickup_exceptions = <   ebony casket
 
         autopickup_exceptions replace the older ban_pickup. Using
-          autopickup_exceptions = >decay, >degeneration
+             autopickup_exceptions = >uselessness, >inaccuracy
         is the same as using
-          ban_pickup = decay, degeneration
+             ban_pickup = uselessness, inaccuracy
 
-        If the regexes are not prefixed with < or >, > is implied, so the
-        option setting above can also be written as
-          autopickup_exceptions = decay, degeneration
+        If the regexes are not prefixed with < or >, > is implied, so
+        the option setting above can also be written as
+             autopickup_exceptions = uselessness, inaccuracy
 
         You can use multiple autopickup_exceptions lines. Some examples:
-          autopickup_exceptions = degeneration, decay, potions? of confusion, 
-          autopickup_exceptions = potions? of slowing, potions? of paralysis
-          autopickup_exceptions = potions? of strong poison,potions? of poison
-          autopickup_exceptions = inaccuracy
-          autopickup_exceptions = scrolls? of paper, immolation, curse armour, 
-          autopickup_exceptions = curse weapon, forgetfulness, uselessness, 
-          autopickup_exceptions = noise, torment
+             autopickup_exceptions = inaccuracy, scrolls? of paper, 
+             autopickup_exceptions = immolation, curse (armour|weapon), 
+             autopickup_exceptions = uselessness, noise, torment
 
-default_autopickup = true
-        When set to false, the game starts with autopickup turned off. You can
-        still toggle autopickup in-game with Ctrl-A.
+        Note that if pickup.lua has been sourced, you won't need to set
+        autopickup exceptions for potions except maybe for very special 
+        cases.
 
-safe_autopickup = true
-        When set, autopickup will not operate if there are visible unfriendly
-        monsters (or statues.) If safe_zero_exp is set (the default), zero-XP
-        monsters are considered friendly. 
+default_autopickup = true
+        When set to false, the game starts with autopickup turned off. 
+        You can still toggle autopickup in-game with Ctrl-A.
 
 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.
+        your burden status (from unencumbered to burdened, or from 
+        encumbered to overloaded.)
 
 pickup_thrown = true
-        pickup_thrown=true causes autopickup to pick up thrown/fired missiles,
-        which can make life much easier for hunter types. If you use this, be
-        aware that autopickup uses a turn - use Ctrl-A to turn it off while
-        you're fighting, or use safe_autopickup=true.
+        pickup_thrown = true causes autopickup to pick up thrown/fired 
+        missiles, which can make life much easier for hunter types. Be 
+        aware that autopickup uses a turn, though it won't trigger if 
+        there are hostile monsters in sight.
 
 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.
+        pickup_dropped lets autopickup affect objects you've dropped. 
+        Set to false to block autopickup for dropped objects. This can 
+        be convenient.
 
 assign_item_slot = (forward | backward)
-        When picking up items, the inventory slot into which the item goes is 
-        normally the first free slot from a-zA-Z (this is the default "forward"
-        behaviour). Setting assign_item_slot to "backward" changes the slot 
-        assignment to the first letter after the last slot. 
+        When picking up items, the inventory slot into which the item 
+        goes is normally the first free slot from a-zA-Z (this is the 
+        default "forward" behaviour). Setting assign_item_slot to 
+        "backward" changes the slot assignment to the first letter after 
+        the last slot. 
         For instance, if you have items on 'a' and 'c', then with
-             assign_item_slot = forward, the next item will go into 'b',
-             assign_item_slot = backward, the next item will go to 'd' instead.
-        With "backward", items dropped/fired and picked up later are more 
-        likely to get their old slot back.
+          assign_item_slot = forward, the next item will go into 'b',
+          assign_item_slot = backward, the next item will go to 'd' 
+        instead.
+        With "backward", items dropped/fired and picked up later are 
+        more likely to get their old slot back.
 
 drop_mode = (multi | single)
-        Single is the classic behaviour; when you select an inventory letter,
-        that item will be dropped immediately. Multidrop allows you to select
-        multiple items to be dropped. (You can also switch to multidrop from
-        the classic drop menu using the '@' key).
+        Single is the classic behaviour; when you select an inventory 
+        letter, that item will be dropped immediately. Multidrop allows 
+        you to select multiple items to be dropped. (You can also switch 
+        to multidrop from the classic drop menu using the '@' key).
 
-        Multidrop is the default and can be very convenient, but be aware that 
-	every item dropped takes one turn. (This is different from picking up.) 
-	When selecting multidrops, the top right corner shows the estimated 
-	number of turns.
+        Multidrop is the default and can be very convenient, but be 
+        aware that every item dropped 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.
+        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 menu, you can choose to select only items that match a 
-        search regex using this option.
+        When selecting items using the global (de)select keys (',' or 
+        '-') in a multidrop menu, you can choose to select only items 
+        that match a search regex using this option.
 
-        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
+        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 
+        regularly sacrifice all weapons except axes, use:
+             drop_filter = axe, broadaxe
 
-        When a drop_filter is set, using the select/deselect keys will set/
-        clear selection of items that match the filter expression(s).
+        When a drop_filter is set, using the select/deselect keys will 
+        set/clear selection of items that match the filter 
+        expression(s).
 
 4-b     Targeting.
 -------------------
 
 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.
+        Set to false to disable targeting zero exp monsters (i.e. 
+        plants) in hostile targeting mode. This is usually convenient to 
+        do.
 
 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,
-        Tab for shops, ^ for traps) and stashes (with the '*' and '/' keys)
-        that are outside line-of-sight but in the main view. This is most
-        sensibly used in connection with stash_tracking=all (see 4-g).  Also
-        see also target_los_first below.
+        When cycling through items with 'x' look-around, setting 
+        target_oos to true allows you to jump the cursor to dungeon 
+        features (<> for stairs, Tab for shops, ^ for traps) and stashes 
+        (with the '*' and '/' keys) that are outside line-of-sight but 
+        in the main view. This is most sensibly used in connection with 
+             stash_tracking = all (see 4-g).  
+        Also see target_los_first below.
 
 target_los_first = true
-        When cycling through items/features with the 'x' look-around command, 
-        setting target_los_first to true will force the cursor to squares in 
-        line-of-sight before going to squares outside LOS.
-
-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.)
+        When cycling through items/features with the 'x' look-around 
+        command, setting target_los_first to true will force the cursor 
+        to squares in line-of-sight before going to squares outside LOS.
 
 default_target = true
         If set to true (the default), targeting will start on either
@@ -416,8 +417,8 @@ default_target = true
         monster (if not) rather than on the character. If no monsters
         are in view, targeting will start on the character regardless.
 
-        If default_target = false, the targeting cursor will always start
-        aimed at the character.
+        If default_target = false, the targeting cursor will always 
+        start aimed at the character.
 
         default_target is mutually exclusive with
         target_unshifted_dirs. Using default_target will automatically
@@ -434,7 +435,6 @@ target_unshifted_dirs = false
         If you use target_unshifted_dirs, default_target will be
         automatically disabled.
 
-
 4-c     Passive Sightings (via detection and remembrance).
 -----------------------------------------------------------
 
@@ -448,11 +448,11 @@ colour_map = true
         Colours out of sight map features on the playing screen.
 
 clean_map = false
-        Cleans up out of sight monsters and clouds on the map. This is like 
-        pressing Ctrl-C (clearing both main screen and level map) all the time.
+        Cleans up out of sight monsters and clouds on the map. This is 
+        like pressing Ctrl-C (clearing both main screen and level map) 
+        all the time.
         Setting this to true can be disconcerting for summoners.
 
-
 4-d     Branding (Item and monster highlighting).
 -------------------------------------------------
 
@@ -460,41 +460,50 @@ Branding refers to displaying particular monsters (e.g. summons) or
 items in a special way; special as in reversing fore- and background.
 There are several branding choices (these will not work everywhere; it
 depends on OS and terminal):
-   standout         -- often the same as reverse, might be underline or dim
-   bold             -- used by colour curses for brightening foreground colours
-   blink            -- used by colour curses for brightening background colours
+   standout         -- often the same as reverse, might be underline or 
+                       dim
+   bold             -- used by colour curses for brightening foreground 
+                       colours
+   blink            -- used by colour curses for brightening background 
+                       colours
    reverse          -- this will probably work
    dim              -- probably no effect
    underline        -- this will probably work
-   highlight:colour -- set background colour of branded monsters to "colour"
+   highlight:colour -- set background colour of branded monsters to 
+                       "colour"
 The last can be abbreviated to hi:colour.
-See part Technical (6-) for dos_use_background_intensity under Windows and DOS.
+See part Technical (6-) for dos_use_background_intensity under Windows 
+and DOS.
 
-By default, no brands are active apart from stair_item_brand.
-
-heap_brand = reverse
-        Brand heaps of items (more than one item or stack).
+By default, only two of the item brands are active (and set to reverse):
+   heap_brand, stair_item_brand
+They can be deactivated by setting them to "none".
 
 friend_brand = none
-        Brand friends in some way. This is very helpful for summoners. E.g.
-          friend_brand = hi:green
-        shows friends with a green background. If the friend is itself green, 
-        it'll show up as black on green.
+        Brand friends in some way. This is very helpful for summoners. 
+        E.g.
+             friend_brand = hi:green
+        shows friends with a green background. If the friend is itself 
+        green, it'll show up as black on green.
 
 stab_brand = none
         Some deities object to you stabbing monsters. Certain classes 
-        specialise in stabbing monsters. Still other characters are happy if 
-        they spot a monster before the monster spots them. In all these cases, 
-        it helps to identify monsters that are unaware of the character (and 
-        hence susceptible to being stabbed) without using the 'x' command. All 
-        the normal 'brand' options apply. For example
-          stab_brand = hi:blue
+        specialise in stabbing monsters. Still other characters are 
+        happy if they spot a monster before the monster spots them. In 
+        all these cases, it helps to identify monsters that are unaware 
+        of the character (and hence susceptible to being stabbed) without 
+        using the 'x' command. All the normal 'brand' options apply. For 
+        example
+             stab_brand = hi:blue
 
 may_stab_brand = none
         Stabbing may be possible even if the monster is not asleep (if
         it's confused or distracted, for instance). This option brands
         monsters that you *might* be able to stab.
 
+heap_brand = reverse
+        Brand heaps of items (more than one item or stack).
+
 stair_item_brand = reverse
         Brands stairs that would otherwise be hidden by items. If you
         use this brand, the items on the square are hidden by the stair
@@ -513,12 +522,12 @@ level_map_cursor_step = 7
         Shift-direction or * direction.
 
 level_map_title = true
-        Whether to show the level name at the top of the level map screen.
+        Whether to show the level name at the top of the level map 
+        screen.
 
 item_colour = true
         Colours items on level-map.
 
-
 4-f     Viewport Display Options
 --------------------------------
 
@@ -590,229 +599,252 @@ scroll_margin = 2
         An aliased option that sets both scroll_margin_x and 
         scroll_margin_y.
 
-
 4-g     Travel and Exploration.
 -------------------------------
 
 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.
+        platform. Setting to -1 will jump to end of travel - you will 
+        not see the individual moves.
 
 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 
-        levitation, 
-          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 levitation, 
+             travel_avoid_terrain = shallow water, deep water
         will prevent travel or explore from going through any water.
 
+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).
+
+explore_stop = items,stairs,shops,altars,gates
+        Explore will stop for one of these conditions. Whatever you set 
+        this option to, anything that stops travel will also stop 
+        explore. Multiple explore_stop lines are *not* cumulative! The 
+        last explore_stop line will override all previous explore_stop 
+        lines. 
+
+tc_reachable      = blue
+tc_dangerous      = cyan
+tc_disconnected   = darkgrey
+tc_excluded       = lightmagenta
+tc_exclude_circle = red
+        The above five settle the colouring of the level map ('X'). 
+        They are 
+          reachable: all squares safely reachable (without leaving the
+                     level)
+          dangerous: squares which are only connected to you via traps,
+                     etc.
+          disconnected: squares which cannot be reached without leaving
+                        the level
+          excluded: the colour for the centre of travel exclusions 
+                    (Ctrl-X)
+          excluded_circle: the colour for travel exclusions apart from 
+                           centre 
+
 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 
-        teleporting. In addition, a message containing one of the expressions 
-        in travel_stop_message will stop travel. For example, 
+        Travel will always stop upon hitpoint loss, confusion, stat 
+        drain, getting encumbered, catching sight of a non-friendly 
+        monster, and teleporting. In addition, a message containing one 
+        of the expressions in travel_stop_message will stop travel. For 
+        example, 
              travel_stop_message = Something appears
-        stops travel if Xom grants us a gift suddenly. To limit a substring
-        match to a message channel, prefix the substring with the channel name
-        and a colon (see section 4-k below on Message Channels). For instance,
-        if you want travel to stop when you're hit by divine retribution, you
-        could use:
+        stops travel if Xom grants us a gift suddenly. To limit a 
+        substring match to a message channel, prefix the substring with 
+        the channel name and a colon (see section 4-k below on Message 
+        Channels). For instance, if you want travel to stop when you're 
+        hit by divine retribution, you could use:
              travel_stop_message = god:wrath finds you
-        If you'd like to stop travel for any message sent to a particular 
-        channel, use a travel_stop_message line with that message channel name
-        and a colon alone. For example, if you're playing a ghoul:
+        If you'd like to stop travel for any message sent to a 
+        particular channel, use a travel_stop_message line with that 
+        message channel name and a colon alone. For example, if you're 
+        playing a ghoul:
              travel_stop_message = rotten_meat:
         Stop travel for any god messages (including prayer)
              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).
-
-explore_stop = items,stairs,shops,altars,gates
-        Explore will stop for one of these conditions. Whatever you set this 
-        option to, anything that stops travel will also stop explore. Multiple 
-        explore_stop lines are *not* cumulative! The last explore_stop line 
-        will override all previous explore_stop lines. 
-
 runrest_ignore_message = <string>
-        This only works if runrest.lua has been sourced already in init.txt.
-        Any message containing the string will *not* stop your run. E.g.
-          runrest_ignore_message = offer a prayer,prayer is over
-          runrest_ignore_message = pleased with you,exalted
+        This only works if runrest.lua has already been sourced in 
+        init.txt. Any message containing the string will *not* stop your 
+        run. E.g.
+             runrest_ignore_message = offer a prayer,prayer is over
+             runrest_ignore_message = pleased with you,exalted
         (useful in conjunction with autoprayer.)
 
+        Note that monster talk and dungeon noises already do not 
+        interrupt running or resting, by default. 
+
 runrest_ignore_poison = <poison damage>:<minimum hp>
-        This only works if runrest.lua has been sourced already in init.txt.
-        Poison damage of x will be ignored if you have at least y hp if you've 
-        defined a runrest_ignore_poison = x:y option. Running here means 
-        shift-running and resting only. Only one runrest_ignore_poison line is
-        considered.  Note that for this work, you should also tell Crawl to
-        ignore the "You feel sick" messages. For example,
-          runrest_ignore_message = You feel.*sick
-          runrest_ignore_poison = 4:100 
+        This only works if runrest.lua has already been sourced in 
+        init.txt. Poison damage of x will be ignored if you have at 
+        least y hp if you've defined a runrest_ignore_poison = x:y 
+        option. Running here means shift-running and resting only. Only 
+        one runrest_ignore_poison line is considered.  Note that for 
+        this work, you should also tell Crawl to ignore the 
+        "You feel sick" messages. For example,
+             runrest_ignore_message = You feel.*sick
+             runrest_ignore_poison = 4:100 
 
 runrest_ignore_monster = <string>:<distance>
-        This only works if runrest.lua has been sourced already in init.txt.
+        This only works if runrest.lua has already been sourced in 
+        init.txt.
 
         Any monster containing the string will only interrupt your
         activity if the distance between you and the monster is
         less than the specified number. E.g. with
              runrest_ignore_monster = fish:3
         all of big fish, jellyfish, giant goldfish and lavafish will be 
-        considered safe for travel, explore and resting as long as the distance
-        is at least 3.
+        considered safe for travel, explore and resting as long as the 
+        distance is at least 3.
 
 trapwalk_safe_hp = <trap_name>:<minimum_hp>, ...
-        This only works if trapwalk.lua has been sourced already in init.txt.
-        Any square containing one of the listed trap types will be considered
-        safe for travel if your hp is greater than or equal to the number
-        connected to the trap in question.
-
-        All the existing trap types can be used, but in practice only the
-        mechanical traps (dart, bolt, arrow, needle, spear, axe, blade) make
-        sense. Note that travel tries to avoid traps if this is easily
-        possible. Defaults to none. For example,
+        This only works if trapwalk.lua has already been sourced in 
+        init.txt. Any square containing one of the listed trap types 
+        will be considered safe for travel if your hp is greater than or 
+        equal to the number connected to the trap in question.
+
+        All the existing trap types can be used, but in practice only 
+        the mechanical traps (dart, bolt, arrow, needle, spear, axe, 
+        blade) make sense. Note that travel tries to avoid traps if this 
+        is easily possible. Defaults to none. For example,
               trapwalk_safe_hp = dart:15, needle:25, spear:50
 
-tc_reachable      = blue
-tc_dangerous      = cyan
-tc_disconnected   = darkgrey
-tc_excluded       = lightmagenta
-tc_exclude_circle = red
-        The above five settle the colouring of the level map ('X'). They are
-        reachable: all squares safely reachable (without leaving the level)
-        dangerous: squares which are only connected to you via traps, etc.
-	disconnected: squares which cannot be reached without leaving the level
-        excluded: the colour for the centre of travel exclusions (Ctrl-X)
-        excluded_circle: the colour for travel exclusions apart from centre 
-
-
 4-h     Stashes.
 ----------------
 
 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 '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. You can also inscribe an item with "=s" to automatically
-        mark a square as a stash whenever that item is dropped.  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. Explicitly marked stashes will never be sacrificed by a
+        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 '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. You can also 
+        inscribe an item with "=s" to automatically mark a square as a 
+        stash whenever that item is dropped.  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. 
+        Explicitly marked stashes will never be sacrificed by a 
         Nemelex Xobeh worshipper.
         
-        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. You can still use Ctrl-S and Ctrl-E as above.
+        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. You can still use Ctrl-S and Ctrl-E as above.
 
 stash_filter = <list of numbers>
-        This option allows filtering certain classes of items when searching
-	stashes. For example,
-	     stash_filter = 14, 4:21
-	filters corpses (14) as well as food of the subtype chunks (4:21).
+        This option allows filtering certain classes of items when 
+        searching stashes.
+        For example:
+             stash_filter = 14, 4:21
+        filters corpses (14) as well as food of the subtype chunks (4:21).
 
 annotate_item_class = false
-        This only works if stash.lua has been sourced already in init.txt.
-	If set to true, automatically annotates items with their object class
-	(e.g. weapon or wand) for stash searching.
+        This only works if stash.lua has already been sourced in 
+        init.txt. Automatically annotates items with their object class, 
+        e.g. weapon or wand, for stash searching.
 
 4-i     Command Enhancements.
 -----------------------------
 
 auto_list = true
         When set (the default), the appropriate inventory items are
-        automatically listed 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 = true
-        Set this option to true if you prefer to have invocations on 'a'-'e' 
-        instead of the older 'A'-'E'. Note that you can change the letters of
-        invocations (and other abilites) with the '=' command.
+        automatically listed 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. 
 
 easy_open = true
-        Open doors by moving on to them. Highly convenient. Note that travel 
-        and exploration will automatically open doors depending on this option.
-
-easy_butcher = true
-        If true, auto-switch to an appropriate uncursed weapon for butchery.
-        For such tools any special messages are ignored. If false, you have to
-        wield the tool manually.
+        Open doors by moving on to them. Highly convenient. Note that 
+        travel and exploration will automatically open doors depending 
+        on this option.
 
 easy_unequip = true
         Allows auto removal of armour and jewellery when dropping it. 
 
 easy_confirm = (none | safe | all)
         Make confirmation questions easier to answer:
-                none = force capitals on Y/N questions
-                safe = force only on questions that will end game (default)
-                all  = never force capitals
-        WARNING TO KEYPAD USERS: The number 7 is mapped to the letter 'y', 
-        which can result in accidentally answering yes to questions; it is 
-        suggested that you use a value of 'none' or 'safe'
+           none = force capitals on Y/N questions
+           safe = force only on questions that will end game (default)
+           all  = never force capitals
+        WARNING TO KEYPAD USERS: The number 7 is mapped to the letter 
+        'y', which can result in accidentally answering yes to 
+        questions; it is suggested that you use a value of 'none' or 
+        'safe'
+
+easy_butcher = true
+        If true, auto-switch to an appropriate uncursed weapon for 
+        butchery. For such tools any special messages are ignored. If 
+        false, you have to wield the tool manually.
+
+always_confirm_butcher = false
+        If true, always request confirmation before butchering. If 
+        false, butchering will proceed automatically if there is exactly 
+        one corpse on the square. If there are multiple corpses on a 
+        square, you will always be prompted, regardless of this option.
 
 easy_quit_item_prompts = true
-        Setting this option to true allows the quitting of item listing with 
-        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. 
+        Setting this option to true allows the quitting of item listing 
+        with 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
-        the menu if easy_exit_menu is true.
+        In multidrop (and pickup) menus, paging past the end will drop 
+        out of the menu if easy_exit_menu is true.
 
 default_autoprayer = false
-        When set to true, the game will start with automatic prayers. This 
-        option can be toggled in-game with Ctrl-V.
+        When set to true, the game will start with automatic prayers. 
+        This option can be toggled in-game with Ctrl-V.
 
-        Automatic prayers take a turn like manual prayers and happen only if
+        Automatic prayers take a turn like manual prayers and happen 
+        only if
         - there is no hostile monster in sight
         - some further conditions (like not standing at an altar)
-        Note that even when you're praying, you can renew prayer anytime.
-        Also note the option safe_zero_exp (see 4-a) decides whether zero 
-        experience monsters (like plants) are considered hostile.
-        If you use autoprayer, you might want to set runrest_ignore_message
-        to ignore the prayer messages (see the documentation for
-        runrest_ignore_message).
+        Note that even when you're praying, you can renew prayer 
+        anytime. Also note the option safe_zero_exp (see 4-a) decides 
+        whether zero experience monsters (like plants) are considered 
+        hostile.
+        If you use autoprayer, you might want to set 
+        runrest_ignore_message to ignore the prayer messages (see the
+        documentation for runrest_ignore_message).
 
 sort_menus = [menu:](true | false | auto:X)[:sort_order]
         Controls if and how items are sorted in inventory and pickup
         menus.
 
-        When sort_menus = false (the default), items are not sorted,
-        and will be ordered by inventory letter (or in the order
-        they're stacked for items on the floor).
+        When sort_menus = false (the default), items are not sorted, and
+        will be ordered by inventory letter (or in the order they're
+        stacked for items on the floor).
 
-        When sort_menus = true, items are sorted by base name,
-        qualified name, curse status and quantity.
+        When sort_menus = true, items are sorted by base name, qualified
+        name, curse status and quantity.
 
         If sort_menus = auto:X, items are sorted if there are at least
         X items in the same category. For instance:
-            sort_menus = auto:5
-        will sort item classes that have at least 5 items. For
-        instance, having 4 kinds of potions would not sort them, but
-        having 5 would.
+             sort_menus = auto:5
+        will sort item classes that have at least 5 items. For instance,
+        having 4 kinds of potions would not sort them, but having 5 
+        would.
 
         You can explicitly specify sort criteria in the sort_menus
         option as:
-            sort_menus = true : basename, qualname, curse, qty
+             sort_menus = true : basename, qualname, curse, qty
 
         Two items will be compared based on the first sort criteria
         where they differ.  So with the sort_menus line given above,
@@ -825,21 +857,21 @@ sort_menus = [menu:](true | false | auto:X)[:sort_order]
         
         * basename:
           This is the name of the item type. The basename for all of
-          "a +0 robe", "an embroidered robe" and "the cursed +2 robe
-          of Ponies" is just "robe".  The basename for both of
-          "a brass ring" and "a ring of fire resistance" are "ring".
+          "a +0 robe", "an embroidered robe" and "the cursed +2 robe of
+          Ponies" is just "robe".  The basename for both of "a brass
+          ring" and "a ring of fire resistance" are "ring".
 
         * qualname:
-          The name of the item without articles (a/an/the),
-          quantities, enchantments, or curse-status. The qualified
-          names for the robes described above are "robe", "embroidered
-          robe" and "robe of Ponies", respectively.  The qualified
-          names for the rings describe above are "brass ring" and
-          "ring of fire resistance", respectively.
+          The name of the item without articles (a/an/the), quantities,
+          enchantments, or curse-status. The qualified names for the 
+          robes described above are "robe", "embroidered robe" and "robe 
+          of Ponies", respectively.  The qualified names for the rings 
+          described above are "brass ring" and "ring of fire 
+          resistance", respectively.
 
         * fullname:
-          This is the name of the item as displayed in menus
-          (including quantities, curse-status, etc.)
+          This is the name of the item as displayed in menus (including
+          (quantities, curse-status, etc.)
 
         * curse:
           Curse-status of the item (if known). Uncursed items show up
@@ -867,23 +899,23 @@ sort_menus = [menu:](true | false | auto:X)[:sort_order]
 
         * freshness:
           The freshness of chunks of meat; irrelevant for everything
-          else.  It makes the oldest chunks of meat show up first, 
-          with rotting chunks listed last for non-Saprovores.
+          else.  It makes the oldest chunks of meat show up first, with
+          rotting chunks listed last for non-Saprovores.
           If this sort criteria is placed before (or in the absence of) 
-          basename and qualname, then non-chunk food items will be 
+          basename and qualname, then non-chunk food items will be
           sorted between the non-rotting and rotting chunks.
 
-        The default sort criteria are: "equipped, basename, qualname,
-        curse, qty".
+        The default sort criteria are: 
+          "equipped, basename, qualname, curse, qty".
 
-        You can ask for a descending order sort by prefixing one or
-        more sort criteria with > as:
-            sort_menus = true : basename, >qty
+        You can ask for a descending order sort by prefixing one or more
+        sort criteria with > as:
+             sort_menus = true : basename, >qty
 
         You can also request sorting only for specific menus:
-            sort_menus = pickup: true
+             sort_menus = pickup: true
         or
-            sort_menus = inv: true
+             sort_menus = inv: true
         (Menu types must be specified as name:, with no space between
         name and colon.)
 
@@ -897,78 +929,111 @@ sort_menus = [menu:](true | false | auto:X)[:sort_order]
         any:    All menus; this is the default when unspecified.
 
         For example, 
-            sort_menus = true : equipped, basename, qualname, curse, qty
-        will produce the same inventory and drop menus as by default, with 
-        the exception that all worn/wielded items come first. This can be
-        convenient if you use the '.' command to select subsequent items.
+             sort_menus = true : equipped, basename, qualname, curse, qty
+        will produce the same inventory and drop menus as by default, 
+        with the exception that all worn/wielded items come first. This 
+        can be convenient if you use the '.' command to select 
+        subsequent items.
 
 4-j     Messages and Display Enhancements.
 ------------------------------------------
 
 hp_warning = 10
-        hp_warning gives "* * * LOW HITPOINT WARNING * * *" on the danger 
-        channel when the player takes damage and their hitpoints are less than
-        this percentage of their maximum (use 0 to turn off these messages).
+        hp_warning gives "* * * LOW HITPOINT WARNING * * *" on the 
+        danger channel when the player takes damage and their hitpoints 
+        are less than this percentage of their maximum (use 0 to turn 
+        off these messages).
 
 mp_warning = 0
         mp_warning gives "* * * LOW MAGIC WARNING * * *" on the danger
-        channel when the player's magic points drop below this percentage of
-        their maximum (use 0 to turn off these messages).
+        channel when the player's magic points drop below this 
+        percentage of their maximum (use 0 to turn off these messages).
 
 hp_colour = lightgrey, 50:yellow, 25:red
-        hp_colour colours your HP appropriately in the display. In the default 
-        setting, your HP will appear in red if at less then 25%, yellow if at 
-        less than 50%, and lightgrey otherwise.
+        hp_colour colours your HP appropriately in the display. In the 
+        default setting, your HP will appear in red if at less then 25%, 
+        yellow if at less than 50%, and lightgrey otherwise.
 
 mp_colour = lightgrey, 50:yellow, 25:red
         mp_colour does to MP what hp_colour does to HP.
 
-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. 
-
 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).
+        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).
+
+show_inventory_weights = false
+        When this is set to true, inventory listings will mention the
+        weight of each item.
 
-always_greet = true
-        always_greet will give the race/class and god messages everytime the 
-        game is started. 
+show_turns = false
+        This option controls whether the turn counter (of turns elapsed) 
+        is displayed in the main view.
 
-menu_colour = <colour>:<regex>
-        This prints a line (of the inventory, a menu, or the discoveries 
-        screen) containing regex in the stated colour. There can be several 
-        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.
+show_beam = false
+        When performing actions such as throwing or zapping, you can 
+        toggle whether to show the beam path or not. This option 
+        controls the initial status of this toggle. When set to true, 
+        the path will be shown.
+
+item_stack_summary_minimum = 5
+        If you step over a stack with this number or more of items in 
+        it, the first description line will contain a summary of all the
+        items in the stack (up to 50 items), in a format which looks
+        like this:
+          Items here: !! """ % ( )))))) [[[
+        Known artefacts will be coloured in yellow; glowing or runed
+        items will be in white, unless you already know that they are
+        not ego items.
+
+menu_colour = <match>:<colour>:<regex>
+        This prints a line (of the inventory, a menu, or the discoveries
+        screen) containing regex in the stated colour. There can be 
+        several statements in a list, and 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.
+
+        The match specifies which listings are affected by the 
+        colouring. If you specify 'any', or completely skip the <match>: 
+        part, then all listings are used. Possible values for match are:
+           ability       (the A screen)
+           description   (the \ screen)
+           equip         (the [, (, ), " screens)
+           help          (the manual)
+           inventory
+           notes         (the ?: screen)
+           resists       (the % screen)
+           spell         (the Z and I screens)
+           stash         (the results from Ctrl-F)
 
         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
+          menu_colour = inventory:lightred: cursed.*(worn|neck|hand|weapon)
+          menu_colour = inventory:green:(worn|neck|hand|weapon)
+          menu_colour = inventory:red: cursed
 
         To colour identified artefacts, try
-          menu_colour = white:( [-+] the)
+          menu_colour = inventory:white:( [-+] the)
 
-        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))
+        If you frequently die because you forget to use emergency items, 
+        try
+          menu_colour = inventory:cyan:(potions? of heal wounds|blinking)
+          menu_colour = inventory:lightcyan:wand of (fire|cold|draining)
 
         To quickly check what potions were trashed by a mummy curse, use
-          menu_colour = lightred:potions? of (degeneration|decay)
+          menu_colour = inventory:lightred:potions? of (degeneration|decay)
 
         If you like to see rotten chunks and corpses at a glance, use
-          menu_colour = red: rotting
+          menu_colour = inventory:red: rotting
 
-        menu_colour can also be applied to colour the in-game notes (to be
-        read with '?:'). The following line will show level ups in white:
-          menu_colour = white:Reached XP level
+        menu_colour can also be applied to colour the in-game notes (to 
+        be read with '?:'). The following line will show level ups in 
+        white:
+          menu_colour = notes:white:Reached XP level
 
 menu_colour_prefix_id = false
-        Setting this option to true will prefix the string against
-        which menu_colour regexes are matched (not the string
+        Setting this option to true will prefix the string against which
+        menu_colour regexes are matched (not the string
         displayed) with the item's identification state: "unidentified"
         for unidentified, "known" for wands for which you know the type
         but don't know the number of charges, and for rings with plusses
@@ -976,17 +1041,17 @@ menu_colour_prefix_id = false
         "identified" for other identified items.
 
         Note that the prefix is put before the the *entire* string which
-        is displayed, so if you're wielding a uncursed dagger which has
+        is displayed, so if you're wielding an uncursed dagger which has
         the 'a' slot, the string the regexes will match against is
         "identified  a - an uncursed dagger (weapon)".
 
 menu_colour_prefix_class = false
         Setting this option to true will prefix the string against which
         menu_colour regexes are matched (not the string displayed) with
-        the item's object type: armour, weapon, wand, etc.  If both
-        this option and menu_colour_prefix_id are set to true, then
-        the identification string comes before the object type string
-        (i.e., "identified weapon", "known wand", etc).
+        the item's object type: armour, weapon, wand, etc.  If both this
+        option and menu_colour_prefix_id are set to true, then the 
+        identification string comes before the object type string (i.e., 
+        "identified weapon", "known wand", etc).
 
         Note that the prefix is put before the the *entire* string which
         is displayed, so if you're wielding a uncursed dagger which has
@@ -994,44 +1059,14 @@ menu_colour_prefix_class = false
         "weapon  a - an uncursed dagger (weapon)".
 
 message_colour = <colour>:[<channel>:]<regex>
-        message_colour allows you to override colours for individual messages.
-        For instance, if you find the low hp warning to be insufficiently
-        attention grabbing, you could do something like
-          message_colour = yellow:LOW HITPOINT WARNING
+        message_colour allows you to override colours for individual 
+        messages. For instance, if you find the low hp warning to be          
+        insufficiently attention grabbing, you could do something like
+             message_colour = yellow:LOW HITPOINT WARNING
         You can also narrow the message match to a specific channel:
-          message_colour = lightred:god:xom
+             message_colour = lightred:god:xom
         If you don't want to see a message at all, you can mute it:
-          message_colour = mute:You start resting
-
-increasing_skill_progress = true
-        This affects the appearance of the skills screen ('m'). With the 
-        default true, the progress for getting new 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_inventory_weights = false
-        When this is set to true, inventory listings will mention the
-        weight of each item.
-
-show_turns = false
-        This option controls whether the turn counter (of turns elapsed) is
-        displayed in the main view.
-
-show_beam = false
-        When performing actions such as throwing or zapping, you can toggle 
-        whether to show the beam path or not. This option controls the 
-	    initial status of this toggle. When set to true, the path will be 
-    	shown.
-
-item_stack_summary_minimum = 5
-        If you step over a stack with this number or more of items in it,
-        the first description line will contain a summary of all the
-        items in the stack (up to 50 items), in a format which looks
-        like this:
-        Items here: !! """ % ( )))))) [[[
-        Known artefacts will be coloured in yellow; glowing or runed
-        items will be in white.
+             message_colour = mute:You start resting
 
 4-k     Missiles.
 -----------------
@@ -1041,19 +1076,21 @@ fire_items_start = c
 
 fire_order  = launcher, return, 
 fire_order += javelin / dart / stone / rock / spear / net / handaxe
-        Controls the order of items autoselected for firing. Items should
-	be separated by commas and items that appear first get higher priority.
-	You can use multiple fire_order lines - all lines but the first must
-	use fire_order +=
-
-        Items in any position may be slash-separated to indicate that these
-        are of equal priority. If this is the case, the first item in your 
-	inventory that fits one of these will be picked for firing.
+        Controls the order of items autoselected for firing. Items 
+        should be separated by commas and items that appear first get 
+        higher priority. You can use multiple fire_order lines - all 
+        lines but the first must use fire_order +=
+
+        Items in any position may be slash-separated to indicate that 
+        these are of equal priority. If this is the case, the first item 
+        in your inventory that fits one of these will be picked for 
+        firing.
         
-        'launcher' refers to firing the appropriate missile for the wielded 
-        weapon (ie crossbow, bow, sling, blowgun). You'll almost certainly 
-        want it first, as it'll be ignored when you're not wielding a ranged 
-        weapon. 'return' refers to (identified) weapons of returning.
+        'launcher' refers to firing the appropriate missile for the 
+        wielded weapon (ie crossbow, bow, sling, blowgun). You'll almost 
+        certainly want it first, as it'll be ignored when you're not 
+        wielding a ranged weapon. 'return' refers to (identified) 
+        weapons of returning.
 
 (See also pickup_thrown in 4-a.)
 
@@ -1061,10 +1098,10 @@ fire_order += javelin / dart / stone / rock / spear / net / handaxe
 -------------------------
 
 Crawl communicates to the players with its message window. Every message
-belongs to one of the so-called channels. The behaviour of each channel can be
-changed with the option
+belongs to one of the so-called channels. The behaviour of each channel 
+can be changed with the option
 
-        channel.CHANNEL_NAME = (COLOUR | mute | default | on | off | plain)
+     channel.CHANNEL_NAME = (COLOUR | mute | default | on | off | plain)
 
 CHANNEL_NAME can currently be one of these:
    plain           = regular text (and things "uncoloured")
@@ -1077,16 +1114,18 @@ CHANNEL_NAME can currently be one of these:
    warning         = various other warnings
    recovery        = recovery from disease/stat loss/poison conditions
    talk            = monsters talking
-   talk_visual     = monster performing some action which the player sees
+   talk_visual     = monster performing some action that the player sees
    intrinsic_gain  = level/stat/species power gains
    mutation        = gain/lose mutations
-   monster_spell   = messages about monsters gesturing and casting spells
-   monster_enchant = messages pertaining to monster enchantments (up or down)
+   monster_spell   = messages about monsters gesturing or casting spells
+   monster_enchant = messages pertaining to monster enchantments
    monster_damage  = messages telling how damaged a monster is
    rotten_meat     = messages about chunks/corpses becoming rotten
    equipment       = messages inidcating worn/wielded equipment
-   floor           = messages when looking at or walking over a floor item
-   multiturn       = indicates long actions (wearing armour, dissecting etc.)
+   floor           = messages when looking at or walking over a floor 
+                     item
+   multiturn       = indicates long actions (wearing armour, dissecting 
+                     etc.)
    examine         = messages from examine your surroundings
    examine_filter  = boring messages from examining your surroundings
    diagnostics     = debugging messages
@@ -1098,23 +1137,26 @@ The channel options are
    alternate = turn channel on to it's alternate "colourful" scheme
    on        = same as default
    plain     = make channel the same colour as the "plain" channel
-               (won't do anything silly like "mute" if plain == mute, though)
+               (won't do anything silly like "mute" if plain == mute, 
+               though)
    off       = same as plain
-   COLOUR can be any of the colours described in section 6-a (colours option).
+COLOUR can be any of the colours described in section 6-a (colours 
+option).
 
-The only multi-colour channels currently are monster_damage and god. All other
-channels are defaulted to on, except for multiturn, which defaults to mute.
+The only multi-colour channels currently are monster_damage and god. All 
+other channels are defaulted to on, except for multiturn, which defaults 
+to mute.
 Note that the template init.txt sets
-          channel.multiturn = on
-in order to help new players. You may want to comment out this option, if 
-the messages are too verbose.
+     channel.multiturn = on
+in order to help new players. You may want to comment out this option, 
+if the messages are too verbose.
 
 4-m     Inscriptions.
 ---------------------
 
-In Crawl, items can be manually inscribed with the '{' command. This adds a 
-note in curly braces to the item inscription. Several inscriptions are
-functional, namely all containing one of the following
+In Crawl, items can be manually inscribed with the '{' command. This 
+adds a note in curly braces to the item inscription. Several 
+inscriptions are functional, namely all containing one of the following
  @w9    -- now typing 'w9' will wield this item
  @*9    -- now any action command followed by '9' will use this item
  !w     -- before wielding this item, Crawl will ask for confirmation
@@ -1125,27 +1167,29 @@ functional, namely all containing one of the following
            skipped, and none of the items sacrificed.
  =p     -- Nemelex Xobeh worshippers will be prompted before
            sacrificing this particular item; if the answer is "no",
-           then Crawl will go on to sacrifice further items in the stack.
+           then Crawl will go on to sacrifice further items in the 
+           stack.
  =g     -- item will be picked up automatically if autopickup is on
  =k     -- item will be ignored in all listings on the ground
-           (it can still be picked up if it's the only item on the ground)
+           (it can still be picked up if it's the only item on the 
+           ground)
  =s     -- If stash tracking is explicit, then dropping this item will
            cause a stash to automatically be marked.
-(in the example 'w' could be any sensible command and '9' could be any digit).
-An item may contain more than one shortcut. 
 
-autoinscribe = <regex>:<inscription>
-        Any item whose description contains the regex will be automatically
-        inscribed (if autopickup is toggled on). For example, marking all 
-        royal jellies and honeycombs eases the Hive (if food is not in the
-        autopickup option):
-          autoinscribe = royal jell:=g
-          autoinscribe = honeycomb:=g
+In the example, 'w' could be any sensible command and '9' could be any 
+digit. An item may contain more than one shortcut. 
 
-        Another use of autoinscription is making sure that you don't lose
-        charges of important wands accidentally, as in
-          autoinscribe = wand of healing:!z
+autoinscribe = <regex>:<inscription>
+        Any item whose description contains the regex will be 
+        automatically inscribed (if autopickup is toggled on). For 
+        example, marking all royal jellies and honeycombs eases the Hive 
+        (if food is not in the autopickup option):
+             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-n     Macro related Options.
 ------------------------------
@@ -1153,12 +1197,13 @@ autoinscribe = <regex>:<inscription>
 flush.failure = true
 flush.command = false
 flush.message = false
-        These are useful when using macros. Setting one of these sub-options 
-        to true will cause the entire input buffer to be dumped and thus 
-        effectively stop the macro. The sub-options currently are
-                failure -- when spells/abilities get miscast 
-                command -- whenever the game is about to get the next command
-                message -- whenever the game outputs a non-mute message 
+        These are useful when using macros. Setting one of these 
+        sub-options to true will cause the entire input buffer to be 
+        dumped and thus effectively stop the macro. The sub-options 
+        currently are
+           failure -- when spells/abilities get miscast 
+           command -- whenever the game is about to get the next command
+           message -- whenever the game outputs a non-mute message 
 
 
 5-  Character Dump.
@@ -1168,55 +1213,60 @@ flush.message = false
 ------------------------
 
 The character dump or morgue files end with a list of all monsters that
-perished while the character was active. By default, dead monsters are grouped
-in three parts:
+perished while the character was active. By default, dead monsters are 
+grouped in three parts:
    Vanquished Creatures    -- monsters killed by the character
    Collateral Kills        -- kills of friendly monsters
    Others                  -- all other casualties (e.g. traps, hostile
                               monsters)
 
 kill_map = friend:you, other:you
-        will merge friendly and other kills into the main vanquished creatures
-        list.  Note that the merging is only for display (the game still
-        maintains three separate lists internally) and that kill places (see
-        below) may be in the wrong order for merged entries. The default is an
-        empty list.
+        will merge friendly and other kills into the main vanquished 
+        creatures list.  Note that the merging is only for display (the 
+        game still maintains three separate lists internally) and that 
+        kill places (see below) may be in the wrong order for merged 
+        entries. The default is an empty list.
 
 dump_kill_places = (none | all | single)
         In the Vanquished Creatures list, this option controls how the 
-        locations of each kill are displayed. Use 'none' to suppress place 
-        display altogether, 'all' to display all known (up to 5) kill places, 
-        anything else to the default of showing kill places only for single
-        kills
-
-dump_item_origins = artifacts, rods
-        The game remembers where you find items. If you want this item origin
-        memory listed in your dumps, use this option to select which items get 
-        annotated. Available selectors are: 
-                artifacts, ego_arm, ego_weap, jewellery, runes, 
+        locations of each kill are displayed. Use 'none' to suppress 
+        place display altogether, 'all' to display all known (up to 5) 
+        kill places, anything else to the default of showing kill places 
+        only for single kills
+
+dump_item_origins = artefacts, rods
+        The game remembers where you find items. If you want this item 
+        origin memory listed in your dumps, use this option to select 
+        which items get annotated. Available selectors are: 
+                artefacts, ego_arm, ego_weap, jewellery, runes, 
                 rods, staves, books, all, none.
         If you use multiple dump_item_origins lines, the last line takes
         effect; all preceding lines are ignored.
 
-        If you don't want any items to be annotated, set dump_item_origins to 
-        none, and set dump_item_origin_price to -1.
+        If you don't want any items to be annotated, set 
+        dump_item_origins to none, and set dump_item_origin_price to -1.
 
 dump_item_origin_price = -1
-        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.
+        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 = 7
-        The number of last messages to be displayed in character dump files. 
+        The number of last messages to be displayed in character dump 
+        files. 
 
 dump_order  = header,hiscore,stats,misc,notes,inventory,
 dump_order += skills,spells,overview,mutations,messages,screenshot
 dump_order += 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 +=
+        dump_order lines - all lines but the first must use 
+             dump_order +=
 
-        Two optional dump sections are turns_by_place and kills_by_place,
-        which add detailed statistics to where turns were spent and monsters
-        were killed. You can add them to your dump as:
+        Two optional dump sections are turns_by_place and 
+        kills_by_place, which add detailed statistics to where turns 
+        were spent and monsters were killed. You can add them to your 
+        dump as:
+             dump_order += turns_by_place, kills_by_place
 
              dump_order += turns_by_place, kills_by_place
         
@@ -1224,11 +1274,9 @@ dump_order += kills
 5-b     Notes.
 --------------
 
-Crawl can automatically log certain events during play. You can read these in 
-the dump or morgue files. Below are options for tweaking this behaviour.
-
-use_notes = true
-        Set to true to get note-taking. The following events are logged:
+Crawl can automatically log certain events during play. You can read 
+these in the dump or morgue files. Below are options for tweaking this behaviour.
+The following events are logged:
         - Gaining or losing a level
         - Entering a dungeon level for the first time
         - Memorizing a spell of higher level than any learned before
@@ -1243,83 +1291,88 @@ use_notes = true
         - Gaining or losing mutations
         - Reaching significant levels in a skill (see below)
         - Dying
-        You can use the command ':' for manually adding notes.
+You can use the command ':' for manually adding notes.
 
 user_note_prefix = <string>
         Prefixes manually added notes with the given string, to make
         them easier to find.
 
 note_items = <regexes>
-        When an item is identified, it will be noted if it is an artifact
-        (fixed, unrand, or random) or if its short description matches a regex.
-        E.g.
-          note_items = rod,book,rune,acquirement
+        When an item is identified, it will be noted if it is an 
+        artefact
+        (fixed, unrand, or random) or if its short description matches a 
+        regex. E.g.
+             note_items = rod,book,rune,acquirement
 
+note_monsters = <regex list>
+        Monsters whose name matches an item in this comma-separated list 
+        are considered interesting. You can have multiple note_monsters 
+        lines. E.g.
+             note_monsters = Klown,orb of fire
+        
 ood_interesting = 8
-        Monsters which are out of depth (OOD for short) for their current
-        level, e.g. a dragon on level 2, will be noted if they are out of depth
-        by at least ood_interesting levels. To disable OOD monster noting, set 
-        ood_interesting to 500; the default is 8.
+        Monsters which are out of depth (OOD for short) for their 
+        current level, e.g. a dragon on level 2, will be noted if they 
+        are out of depth by at least ood_interesting levels. To disable 
+        OOD monster noting, set ood_interesting to 500.
         Unique monsters are always noted, regardless of this setting.
         OOD monsters are only noted in the main dungeon.
 
 note_hp_percent = 5
-        If your HP falls below a certain note_hp_percentage of your max HP, a 
-        note will be taken. There is some code to avoid repetitions of notes
-        based on the same incident.
+        If your HP falls below a certain note_hp_percentage of your max 
+        hit points, a note will be taken. There is some code to avoid
+        repetitions of notes based on the same incident.
 
 note_skill_levels = 1,5,13,27
-        This sets which skill levels are noteworthy. You can have multiple 
-        note_skill_levels lines. The default is nothing (no notes.)
+        This sets which skill levels are noteworthy. You can have 
+        multiple note_skill_levels lines. The default is nothing (no 
+        notes.)
 
 note_all_skill_levels = false
-        This is a shortcut for note_skill_levels = 1,2,..,27. If you set this 
-	to true, all skill levels are noteworthy.
+        This is a shortcut for note_skill_levels = 1,2,..,27. If you set 
+        this to true, all skill levels are considered noteworthy.
 
 note_skill_max = false
-        Setting this option will cause a note whenever a new maximum in skill
-        levels is reached. If note_skill_max is true and note_skill_levels is 
-        nonempty, notes will be taken whenever either of the criteria are met.
-        
-note_monsters = <regex list>
-        Monsters whose name matches an item in this comma-separated list are 
-        considered interesting. You can have multiple note_monsters lines. E.g.
-          note_monsters = Klown,orb of fire
+        Setting this option will cause a note whenever a new maximum in 
+        skill levels is reached. If note_skill_max is true and 
+        note_skill_levels is nonempty, notes will be taken whenever 
+        either of the criteria are met.
         
+note_all_spells = true
+        Will add a note for each spell memorised.
+
 note_messages = <regex list>
         Messages which match an item in this comma-separated list are 
-        considered interesting. You can have multiple note_messages lines. E.g.
-          note_messages = Something interferes
-          note_messages = protects you from harm
+        considered interesting. You can have multiple note_messages 
+        lines. E.g.
+             note_messages = Something interferes
+             note_messages = protects you from harm
         If you want all banishments to the Abyss noted, use
-          note_messages = [bB]anish.*Abyss
+             note_messages = [bB]anish.*Abyss
         If you want a note when your draconian scales turn <colour>, use
-          note_messages = Your scales start
+             note_messages = Your scales start
 
-note_all_spells = true
-        Will add a note for each spell memorised.
 
 6-  Miscellaneous.
-==============
+==================
 
 6-a     All OS.
 ---------------
 
 macro_meta_entry = true
-        macro_meta_entry lets you specify non-printable keycodes like \{3} when
-        creating a macro. For instance, if you want to keymap 0 to Escape, you'd
-        use a target keycode of \{27}.
+        macro_meta_entry lets you specify non-printable keycodes like 
+        \{3} when creating a macro. For instance, if you want to keymap 
+        0 to Escape, you'd use a target keycode of \{27}.
 
 mouse_input = false
-        When enabled, the mouse_input option allows the game to use
+        When enabled, the mouse_input option allows the game to use 
         mouse input events on certain platforms (Windows and Unix).
         Note that the extent of mouse support varies greatly across
-        platforms and is strongly influenced by your terminal
-        settings.
+        platforms and is strongly influenced by your terminal settings.
 
-        On Unixes, you're only likely to get mouse support working
-        with ncurses in xterms (specifically your $TERM probably needs
-        to contain "xterm" for ncurses to activate its mouse events;
+        On Unixes, you're only likely to get mouse support working with
+        ncurses in xterms (specifically your $TERM probably needs to
+        contain "xterm" for ncurses to activate its mouse events;
         if you're running Crawl in GNU screen in an xterm, the mouse
         will probably not work).
 
@@ -1330,14 +1383,37 @@ mouse_input = false
         right-clicking the titlebar of your command-prompt, selecting
         Properties and disabling QuickEdit in the Options tab.
 
+wiz_mode = (no | never | yes)
+        Wizard mode options (available only in WIZARD compiles):
+          yes   -- start games in wizard mode (game will not be scored)
+          no    -- still allows player to enter wizard mode after start 
+                   of game
+          never -- never allow a wizard command to be used
+
+char_set = (ascii | ibm | dec | unicode)
+        Chooses different character sets for the game play screen. DOS 
+        and Windows users will want to use the IBM character set, Unix 
+        users will prefer DEC or plain ASCII.
+
+        On Unix, Crawl may be built with Unicode support, in which case 
+        you can use char_set = unicode to use unicode characters in the 
+        map display.
+
+classic_item_colours = false
+        Crawl uses 4.0 b26/0.1.x-like item colours if 
+        classic_item_colours is set to true. The default (false) is to 
+        use the new 0.2 item colours.
+        This option will not affect the colour of existing items, only 
+        items generated after the option is set.
+
 colour.OLDCOLOUR = NEWCOLOUR
-        Useful for terminals where some colours are hard to read (and cannot
-        be adjusted), as well as for creating a custom scheme, especially when 
-        used with the background option on a terminal with a non-black 
-        background.
-        Format is colour.OLDCOLOUR = NEWCOLOUR, later rules take preference and
-        the NEWCOLOUR is always literal (ie. it won't re-evaluate to a 
-        different colour).
+        Useful for terminals where some colours are hard to read (and 
+        cannot be adjusted), as well as for creating a custom scheme, 
+        especially when used with the background option on a terminal 
+        with a non-black background.
+        Format is colour.OLDCOLOUR = NEWCOLOUR, later rules take 
+        preference and the NEWCOLOUR is always literal (ie. it won't 
+        re-evaluate to a different colour).
         The colours are:
                 black, blue, green, cyan, red, magenta, brown, lightgrey, 
                 darkgrey, lightblue, lightgreen, lightcyan, lightred, 
@@ -1347,169 +1423,149 @@ colour.OLDCOLOUR = NEWCOLOUR
           colour.lightcyan = cyan
           colour.yellow    = brown
 
-wiz_mode = (no | never | yes)
-        Wizard mode options (available only in WIZARD compiles):
-          yes   -- start games in wizard mode (game will not be scored)
-          no    -- still allows player to enter wizard mode after start of game
-          never -- never allow a wizard command to be used
-
-char_set = (ascii | ibm | dec | unicode)
-        Chooses different character sets for the game play screen. DOS and
-        Windows users will want to use the IBM character set, Unix users will
-        prefer DEC or plain ASCII.
-
-        On Unix, Crawl may be built with Unicode support, in which case you
-        can use char_set = unicode to use unicode characters in the map
-        display.
-
 cset_ascii, cset_ibm, cset_dec, cset_unicode, cset_any
-        Can be used to change individual characters in a specific character 
-        set (the character set used for display is determined by the char_set 
-        option). The syntax is the same for all of these; cset_any changes
-        characters in all character sets.
+        Can be used to change individual characters in a specific 
+        character set (the character set used for display is determined 
+        by the char_set option). The syntax is the same for all of 
+        these; cset_any changes characters in all character sets.
 
 cset_XXX = <dungeon_character_name : symbol>
         a list of these is allowed, as well.
 
         The possible entries for dungeon_character_name are:
-           wall, wall_magic, floor, floor_magic, door_open, door_closed, trap,
-           stairs_down, stairs_up, altar, arch, fountain, wavy, statue,
-           invis_exposed, item_detected, item_orb, item_weapon, item_armour,
-           item_wand, item_food, item_scroll, item_ring, item_potion,
-           item_missile, item_book, item_stave, item_miscellany, item_corpse,
-           item_gold, item_amulet, cloud
+           wall, wall_magic, floor, floor_magic, door_open, door_closed, 
+           trap, stairs_down, stairs_up, altar, arch, fountain, wavy, 
+           statue, invis_exposed, item_detected, item_orb, item_weapon,
+           item_armour, item_wand, item_food, item_scroll, item_ring, 
+           item_potion, item_missile, item_book, item_stave, 
+           item_miscellany, item_corpse, item_gold, item_amulet, cloud
         Most of these are self-explanatory. "arch" is used for shops and
         portals.  "floor_magic" and "wall_magic" are used to display
-        magic-mapped squares on the level map. "invis_exposed" is the character
-        for water creatures submerged in shallow water, or invisible creatures
-        wading in shallow water.
+        magic-mapped squares on the level map. "invis_exposed" is the 
+        character for water creatures submerged in shallow water, or 
+        invisible creatures wading in shallow water.
 
-        Symbols can be specified using a letter, or by a number (decimal code),
-        or a hexadecimal number (prefixed with x):
+        Symbols can be specified using a letter, or by a number (decimal 
+        code), or a hexadecimal number (prefixed with x):
         
         For an example on IBM displays,
-            cset_ibm = wall:219, arch:0, wavy:x7E
-        shows walls as solid blocks, shops and portals as '0', and water as
-        '~'.
+             cset_ibm = wall:219, arch:0, wavy:x7E
+        shows walls as solid blocks, shops and portals as '0', and water 
+        as '~'.
 
 feature = <regex> { <symbol>, <magicmap symbol>, <view colour>,
                     <levelmap_magic_colour>, <levelmap_seen_colour>,
                     <emphasised_colour>, <levelmap_emphasised_colour> }
-        where <regex> is a regular expression describing a dungeon feature.
-        This regex should match the description when using the 'x' command.
-        In case the regex matches several descriptions, all such features are
-        affected.
+        where <regex> is a regular expression describing a dungeon 
+        feature. This regex should match the description when using the 
+        'x' command. In case the regex matches several descriptions, all 
+        such features are affected.
 
-        The list in {...} specifies the appearance of the dungeon feature(s),
-        and should be self-explanatory. <symbol> can be used to override the
-        above cset options, or also to distinguish among subtypes of a
-        character.
+        The list in {...} specifies the appearance of the dungeon 
+        feature(s), and should be self-explanatory. <symbol> can be used 
+        to override the above cset options, or also to distinguish among
+        subtypes of a character.
 
-        'magic' always refers to magic mapping. So the <magicmap symbol> entry
-        determines what symbol will be used for features only detected via
-        magic mapping.
+        'magic' always refers to magic mapping. So the <magicmap symbol> 
+        entry determines what symbol will be used for features only 
+        detected via magic mapping.
 
         'emphasised_colour' refers to the colour used to highlight
-        unvisited stone stairs; for non-stair features, setting
-        emphasis colours does nothing useful.
+        unvisited stone stairs; for non-stair features, setting emphasis
+        colours does nothing useful.
 
-        Leading parameters in the {...} list can be omitted by leaving them 
-        blank and using placeholder commas. Trailing parameters can be omitted
-        without placeholder commas.
+        Leading parameters in the {...} list can be omitted by leaving 
+        them blank and using placeholder commas. Trailing parameters can 
+        be omitted without placeholder commas.
 
-        Multiple feature option lines can be used, as can multiple feature
-        descriptions strung together on the same line separated by semicolons.
+        Multiple feature option lines can be used, as can multiple 
+        feature descriptions strung together on the same line separated 
+        by semicolons.
 
         Examples:
          * Colour rock walls red:
-            feature = rock wall { , , red }
+             feature = rock wall { , , red }
          * Use # for metal walls in all character sets:
-            feature = metal wall {#}
+             feature = metal wall {#}
 
         Symbols can be specified as with cset:
-            feature = metal wall {#}
-            feature = metal wall {35}
-            feature = metal wall {x23}
+             feature = metal wall {#}
+             feature = metal wall {35}
+             feature = metal wall {x23}
         all do the same thing.
 
 mon_glyph = <monster name or symbol> : <colour> <glyph>
         The mon_glyph option allows you to customise the symbol and
         colour used to display a monster.
 
-        You can customise symbols based on monster names or their existing
-        symbols. For instance, if you want to put elves on E and efreeti
-        on e, you can do this:
+        You can customise symbols based on monster names or their 
+        existing symbols. For instance, if you want to put elves on E 
+        and efreeti on e, you can do this:
 
-        mon_glyph = e : E
-        mon_glyph = E : e
+             mon_glyph = e : E
+             mon_glyph = E : e
 
-        If you want to change the symbol for a monster that uses a
-        space as a symbol, specify an underscore on the left:
+        If you want to change the symbol for a monster that uses a space
+        as a symbol, specify an underscore on the left:
 
-        mon_glyph = _ : #
+             mon_glyph = _ : #
 
         (That changes shades to use #.)
 
-        You can specify a different symbol, or a colour, or both, in
-        any order. Here are more examples:
+        You can specify a different symbol, or a colour, or both, in any
+        order. Here are more examples:
 
-        mon_glyph = deep elf annihilator : E lightmagenta
-        mon_glyph = Xtahua : lightmagenta D
-        mon_glyph = large zombie : darkgrey
-        mon_glyph = small simulacrum : x
+             mon_glyph = deep elf annihilator : E lightmagenta
+             mon_glyph = Xtahua : lightmagenta D
+             mon_glyph = large zombie : darkgrey
+             mon_glyph = small simulacrum : x
 
         (The left hand side of the : is case-sensitive.)
         
-        You can specify symbols using their code points using the
-        syntax as shown in the "feature" option. If you're using
+        You can specify symbols using their code points using the syntax
+        as shown in the "feature" option. If you're using
         char_set=unicode, you can use unicode code points:
         
-        mon_glyph = draconian scorcher : x6e9
+             mon_glyph = draconian scorcher : x6e9
 
         A single _ is treated as a space; if you want a real underscore,
         put a \ in front of it like this:
 
-        mon_glyph = player ghost : \_
-
-classic_item_colours = false
-        Crawl uses 4.0 b26/0.1.x-like item colours if classic_item_colours is
-        set to true. The default (false) is to use the new 0.2 item colours.
-        This option will not affect the colour of existing items, only items
-        generated after the option is set.
+             mon_glyph = player ghost : \_
 
 6-b     DOS and Windows.
 ------------------------
 
 dos_use_background_intensity = false
         On DOS and Windows, if you're using a console that can do
-        high-intensity background colours, set this option to true for superior
-        friend-branding. If your console doesn't like this option, some
-        friendly monsters will appear as blinking characters (and setting this
-        option to false may be advisable to preserve your sanity in such
-        cases).
+        high-intensity background colours, set this option to true for 
+        superior friend-branding. If your console doesn't like this 
+        option, some friendly monsters will appear as blinking 
+        characters (and setting this option to false may be advisable to
+        preserve your sanity in such cases).
 
 6-c     Unix
 ------------
 
-background = <colour>
-        Sets the default background colour by name (defaults to BLACK). This
-        may be useful if you're using a terminal with a background colour other
-        than black (such as an xterm), but this option is still experimental
-        and the results may not be very good.
+background = black
+        Sets the default background colour by name (defaults to BLACK). 
+        This may be useful if you're using a terminal with a background 
+        colour other than black (such as an xterm), but this option is 
+        still experimental and the results may not be very good.
 
 use_fake_cursor = false
         If true, Crawl draws the cursor explicitly on the level-map and
-        targeting screens instead of relying on the term to draw the cursor.
-        Use this if your term cannot show a cursor over darkgrey/black
-        squares.
+        targeting screens instead of relying on the term to draw the 
+        cursor. Use this if your term cannot show a cursor over 
+        darkgrey/black squares.
 
 
-7-      Inline Lua
-------------------
+7-  Inline Lua
+==============
 
-Lua code can be used directly in your init.txt/.crawlrc. You can use
-Lua to selectively include parts of your init.txt (based on character
-type, for instance) using this syntax:
+Lua code can be used directly in your init.txt/.crawlrc. You can use Lua
+to selectively include parts of your init.txt (based on character type, 
+for instance) using this syntax:
 
 < Lua code >
 or
@@ -1536,10 +1592,10 @@ autopickup = $?+"/
 autopickup = $?+"/!%
 : end
 
-  or
+   or 
 
 : if you.race() == "Hill Orc" then
 priest = Beogh
 : else
 priest = Yredelemnul
-:end
+: end