Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource

doc/Guidebook.mn

@@ -710,12 +710,6 @@ the exchange still takes place.
 .lp X
 Toggle two-weapon combat, if your character can do it.  Also available
 via the ``#twoweapon'' extended command
-.lp ""
-Since using this command by accident would be troublesome, you are asked
-to confirm your intent before switching to explore mode.  By default
-the response 'y' acknowledges that intent.  You can set the
-.op paraniod_confirmation
-option to require a response of "yes" instead.
 .lp ^X
 Display basic information about your character.
 .lp ""
@@ -848,7 +842,7 @@ You probably shouldn't start off a new game by praying right away.)
 Since using this command by accident can cause trouble, there is an
 option to make you confirm your intent before praying.  It is enabled
 by default, and you can reset the
-.op paraniod_confirmation
+.op paranoid_confirmation
 option to disable it.
 .lp #quit
 Quit the program without saving your game.
@@ -856,7 +850,7 @@ Quit the program without saving your game.
 Since using this command by accident would throw away the current game,
 you are asked to confirm your intent before quitting.  By default a
 response of 'y' acknowledges that intent.  You can set the
-.op paraniod_confirmation
+.op paranoid_confirmation
 option to require a response of "yes" instead.
 .lp #ride
 Ride (or stop riding) a monster.
@@ -1138,7 +1132,7 @@ In most circumstances, if you attempt to attack a peaceful monster by
 moving into its location, you'll be asked to confirm your intent.  By 
 default an answer of 'y' acknowledges that intent,
 which can be error prone if you're using 'y' to move.  You can set the
-.op paraniod_confirmation
+.op paranoid_confirmation
 option to require a response of "yes" instead.
 .pg
 If you can't see a monster (if it is invisible, or if you are blinded),
@@ -2175,7 +2169,7 @@ is the same as specifying 0.
 (Settings 2 and 4 are for compatibility with MSDOS or old PC Hack;
 in addition to the different behavior for `5', `Alt-5' acts as `G'
 and `Alt-0' acts as `I'.
-Setting -1 is to accomodate some German keyboards which have the
+Setting -1 is to accommodate some German keyboards which have the
 location of the `y' and `z' keys swapped.)
 When moving by numbers, to enter a count prefix for those commands
 which accept one (such as ``12s'' to search twelve times), precede it
@@ -2994,7 +2988,7 @@ command-line switch or with the
 .op playmode:explore
 option.  The other is to issue the ``#exploremode'' extended command while
 already playing the game.  Starting a new game in explore mode provides your
-character with a wand of wishing in initial inventory; switching via `X'
+character with a wand of wishing in initial inventory; switching
 during play does not.  The other benefits of explore mode are left for
 the trepid reader to discover.
 .pg

doc/Guidebook.tex

@@ -862,13 +862,8 @@ two-weapon combat.  Note that if one of these slots is empty,
 the exchange still takes place.
 %.lp
 \item[\tb{X}]
-Enter explore (discovery) mode, explained in its own section later.\\
+Toggle two-weapon combat, if your character can do it.  Also available
-%.lp ""
+via the ``#twoweapon'' extended command
-Since using this command by accident would be troublesome, you are asked
-to confirm your intent before switching to explore mode.  By default
-the response `{\tt y}' acknowledges that intent.  You can set the
-{\it paranoid\_confirmation\/}
-option to require a response of ``yes'' instead.
 %.lp
 \item[\tb{\^{}X}]
 Display basic information about your character.\\
@@ -2276,8 +2271,7 @@ each entry. Such a sequence can be continued to multiple lines by putting a
 `{\tt \verb+\+}' at the end of each line to be continued.
 
 %.pg
-If your copy of the game included the compile time AUTOPICKUP\_EXCEPTIONS 
+Any line starting with ``{\tt AUTOPICKUP\_EXCEPTION=}'' 
-option, then any line starting with ``{\tt AUTOPICKUP\_EXCEPTION=}'' 
 is taken as defining an exception to the ``{\tt pickup\_types}'' option.
 There is a section of this Guidebook that discusses that.
 
@@ -2328,6 +2322,9 @@ or make ready
 with the `Q' command instead.  If no weapon is found or the option is
 false, the `t' (throw) command is executed instead.  (default false)
 %.lp
+\item[\ib{bones}]
+Allow saving and loading bones files.  (default true)
+%.lp
 \item[\ib{boulder}]
 Set the character used to display boulders (default is rock class symbol).
 %.lp
@@ -2476,6 +2473,9 @@ Enable mail delivery during the game (default on).
 An obsolete synonym for ``{\tt gender:male}''.  Cannot be set with the
 `{\tt O}' command.
 %.lp
+\item[\ib{mention\_walls}]
+Give feedback when walking against a wall (default off).
+%.lp
 \item[\ib{menustyle}]
 Controls the interface used when you need to choose various objects (in
 response to the Drop command, for instance).  The value specified should
@@ -2521,13 +2521,16 @@ Default `\verb+|+'.
 Menu character accelerator to goto the next menu page.
 Implemented by the Amiga, Gem and tty ports.
 Default `\verb+>+'.
+\item[\ib{menu\_objsyms}]
+Show object symbols in menu headings in menus where
+the object symbols act as menu accelerators (default off).
 \item[\ib{menu\_previous\_page}]
 Menu character accelerator to goto the previous menu page.
 Implemented by the Amiga, Gem and tty ports.
 Default `\verb+<+'.
 \item[\ib{menu\_search}]
 Menu character accelerator to search for a menu item.
-Implemented by the Amiga, Gem and X11 ports.
+Implemented by the Amiga, Gem, X11 and tty ports.
 Default `:'.
 \item[\ib{menu\_select\_all}]
 Menu character accelerator to select all items in a menu.
@@ -2601,7 +2604,7 @@ is the same as specifying {\tt 0}.
 (Settings {\tt 2} and {\tt 4} are for compatibility with MSDOS or old PC Hack;
 in addition to the different behavior for `{\tt 5}', `{\tt Alt-5}' acts as `{\tt G}'
 and `{\tt Alt-0}' acts as `{\tt I}'.
-Setting {\tt -1} is to accomodate some German keyboards which have the
+Setting {\tt -1} is to accommodate some German keyboards which have the
 location of the `{\tt y}' and `{\tt z}' keys swapped.)
 When moving by numbers, to enter a count prefix for those commands
 which accept one (such as ``{\tt 12s}'' to search twelve times), precede it
@@ -2679,10 +2682,8 @@ match an autopickup exception.  Default is on.
 %.lp
 \item[\ib{pickup\_types}]
 Specify the object types to be picked up when ``{\it autopickup\/}'' 
-is on.  Default is all types.  If your copy of the game has the 
+is on.  Default is all types.  You can use ``{\it autopickup\_exception\/}''
-compile time option AUTOPICKUP\_EXCEPTIONS included,
+configuration file lines to further refine ``{\it autopickup\/}'' behavior.
-you may be able to use ``{\it autopickup\_exception\/}'' configuration
-file lines to further refine ``{\it autopickup\/}'' behavior.
 %.lp
 \item[\ib{pile\_limit}]
 When walking across a pile of objects on the floor, threshold at which
@@ -3075,10 +3076,8 @@ Cannot be set with the `{\tt O}' command.
 \subsection*{Configuring autopickup exceptions}
 
 %.pg
-There is a compile time option called AUTOPICKUP_EXCEPTIONS.  
+You can further refine the behavior of the ``{\tt autopickup}'' option
-If your copy of the game was built with that option defined, you can 
+beyond what is available through the ``{\tt pickup\_types}'' option.
-further refine the behavior of the ``{\tt autopickup}'' option beyond 
-what is available through the ``{\tt pickup\_types}'' option.
 
 %.pg
 By placing ``{\tt autopickup\_exception}'' lines in your configuration
@@ -3565,9 +3564,9 @@ There are two ways of enabling explore mode.  One is to start the game
 with the {\tt -X}
 command-line switch or with the
 {\it playmode:explore\/}
-option.  The other is to issue the `{\tt X}' command while already
+option.  The other is to issue the `{\tt #exploremode}' extended command while
-playing the game.  Starting a new game in explore mode provides your
+already playing the game.  Starting a new game in explore mode provides your
-character with a wand of wishing in initial inventory; switching via `X'
+character with a wand of wishing in initial inventory; switching
 during play does not.  The other benefits of explore mode are left for
 the trepid reader to discover.
 

doc/fixes35.0

@@ -63,7 +63,7 @@ wizard mode: avoid division by 0 crash for level teleport in the endgame if
 don't #sit on an object in a pit if you're only on the precipice
 fix message when pushing a boulder into a pool while riding
 plural of "Nazgul" is "Nazgul" not "Nazguls"
-trap messages referring to named steed were ackwardly worded when hallucination
+trap messages referring to named steed were awkwardly worded when hallucination
 	overrode use of the name
 some actions such as eating corpses off the floor didn't check whether hero
 	could reach the bottom of a pit
@@ -117,7 +117,7 @@ shopkeeper removal of trap from shop doorway yields an open door instead of
 	a closed one if an intact open door is present
 guarantee that hostile djinn released from bottles really are hostile
 handle lava when removing or losing water walking boots
-fix incomplete sentence occuring when unique monster's corpse fell down stairs
+fix incomplete sentence occurring when unique monster's corpse fell down stairs
 fractured boulders or statues produced inconsistent object settings on the
 	resulting rocks
 really fix rolling boulder bug C340-18, the previous "fix" reversed the test
@@ -165,7 +165,7 @@ clean up messages when you stop levitation while riding a flying steed
 monsters evading a kick on noteleport levels would cause a "teleports" message
 interrupt current activity during certain stages of petrification or vomiting
 warning about bad food didn't recognize tin of Medusa meat
-eating tainted Medusa corpse caused food poisioning instead of petrification
+eating tainted Medusa corpse caused food poisoning instead of petrification
 avoid potential stale pointer use after magic bag explosion
 nymphs and monkeys can't steal rings worn under gloves
 monkeys can't steal rings worn under cursed weapon
@@ -237,7 +237,7 @@ when there were multiple boulders at a location, moving one of them sometimes
 	resulted in line-of-sight anomalies
 unicorn can't catch gems if it is asleep or paralyzed
 fix grammar when choking on gold
-prevent lose-level+regain-level cycle from arbritrarily boosting HP and Pw
+prevent lose-level+regain-level cycle from arbitrarily boosting HP and Pw
 prevent polymorphing into "new man" at low level from magnifying HP and Pw
 some messages which referred to "mirror" ought to have used "looking glass"
 incubi react to mirrors
@@ -360,8 +360,8 @@ code handling a monster's use of potion or food to cure stoning or confusion
 properly handle destruction of equipment carried by monsters hit by
 	disintegration breath; life-saving retained conferred properties of
 	formerly worn items (loss of steed's saddle caused much confusion)
-don't exercize or abuse wisdom when rumors get used for random graffiti
+don't exercise or abuse wisdom when rumors get used for random graffiti
-don't exercize wisdom twice for each minor oracle consultation
+don't exercise wisdom twice for each minor oracle consultation
 don't welcome the hero to Delphi if the Oracle was angered before first entry
 create_object() created lizard corpses without timers and troll corpses with
 	their revive timers, then changed the corpsenm field
@@ -383,7 +383,7 @@ specifying role and/or race along with an invalid alignment for it/them in
 temple donation can recover protection previously stolen by attrcurse attack
 	even when protection amount is so big that no increment would be given
 meditating monsters stop meditating when affected by something which wakes
-	sleeping mosnters
+	sleeping monsters
 monsters capable of hiding can't do so when trapped or while holding you
 limit recursive calls to spoteffects (poly'd hero fell into water, reverted
 	to human because of it, fell into same water, then crawled out twice)
@@ -474,7 +474,7 @@ suppress corpse from bones data if death is due to being dissolved in lava
 suppress "you rise from the dead" if game ends due to be turned into slime
 hero poly'd into stone golem and wielding cockatrice corpse casts stone-to-
 	flesh at self to become flesh golem will revert to stone if no gloves
-don't give erroneous "<mon> disppears" message for hero poly'd into quantum
+don't give erroneous "<mon> disappears" message for hero poly'd into quantum
 	mechanic who hits engulfer while swallowed and blinded
 demon lords/princes can't be summoned to the elemental or Astral planes
 feedback from casting spell of protection was wrong in some situations
@@ -496,7 +496,7 @@ can't eat an artifact you're unable to touch
 attempting to kick beyond map edge performed an out of array bounds memory
 	access; symptom seen was "show_glyph: bad pos" warning when blind
 attempting to engrave with an empty wand should always use a turn
-don't access freed memory after engraving "wrests one last charnge" from wand
+don't access freed memory after engraving "wrests one last charge" from wand
 a magic portal could be rendered inactive for the hero if a successful
 	hangup save took place during level change; leaving the level by any
 	means other than triggering the portal would reactivate it
@@ -645,7 +645,7 @@ secret door detection's trap finding is no longer blocked by water or clouds
 potion thrown by monster which hit a long worm's tail gave feedback about
 	hitting its head
 implement energy vortex's previously unused energy drain attack
-changing alignment type resets alignment record to 0 (nomimally aligned)
+changing alignment type resets alignment record to 0 (nominally aligned)
 jellyfish do not technically have a head
 while polymorphed, suppress attribute gain/lose earned by pre-poly exercise
 wizard mode #monpolycontrol prompting asked about "it" when monster was unseen
@@ -670,7 +670,7 @@ if polymorph causes a monster to drop items, they won't be used up via
 monsters who ate green slime corpses weren't turned into green slime
 "hand slip" while naming an object would never pick 'z' as a substitute letter
 hero would "gladly take off <armor>" for nymph or succubus even while asleep
-concealed mimic wasn't revealed if kicking attmpt yielded a clumsy miss
+concealed mimic wasn't revealed if kicking attempt yielded a clumsy miss
 too accurate feedback given to a blinded hero when a monster summons insects
 if life-saved steed became untame, repeated "placing steed onto map?" warnings
 	would be given as long as the hero remained mounted
@@ -730,7 +730,7 @@ shouldn't have been able write scrolls by guessing type name when they're
 scrolls given names can be written by assigned name as well as by description
 fix writing feedback "the spellbook warps strangely, then turns parchment"
 make stone artifacts usually resist stone-to-flesh
-when reading an unknown scroll and learning it, discovery of teleporation was
+when reading an unknown scroll and learning it, discovery of teleportation was
 	too late if hero happened to land on another scroll of teleportation
 using an unlocking tool on a closed door which was actually a mimic reported
 	that there was no door to unlock instead of exposing the mimic
@@ -760,7 +760,7 @@ for number_pad:2 (MSDOS compatibility), M-5 (Alt+5, or Shift+keypad5 using
 	MSDOS/Windows keystroke hackery) didn't function as G movement prefix
 if an angry shopkeeper chased the hero to a different level and then got paid
 	off, he'd dismiss kops on that other level but not on his shop level
-objects inside the Wizard's Tower can't be teleport to outside and vica versa
+objects inside the Wizard's Tower can't be teleport to outside and vice versa
 dying in lava and being life-saved or leaving bones would destroy ring of
 	fire resistance if it happened to be made of wood, and also burn up
 	scrolls of fire and spellbook of fireball
@@ -786,7 +786,7 @@ when shop prices are adjusted, handle roundoff (integer truncation) better
 for hero poly'd into a monster form that lacks a weapon attack but has a claw
 	attack, use wielded weapon even when claw attack isn't the very first
 rename the SLEEPING property and Sleeping attribute to SLEEPY and Sleepy, resp.
-character escape sequence handling during options processing was vulernable
+character escape sequence handling during options processing was vulnerable
 	to malformed escapes and could potentially be abused to clobber the
 	stack and launch a buffer overrun attack
 give alternate message for "<mon> turns to flee" when mon can't move
@@ -815,7 +815,7 @@ hangup save made during magic mapping or <foo> detection performed while
 	underwater could put hero on top of the water after restore
 fix bug preventing stone-resistant monsters w/o gloves from wielding cockatrices
 items conferring life drain resistance were affected by drain life spell
-'a'pply command could be used to recogniize undiscovered potions of oil
+'a'pply command could be used to recognize undiscovered potions of oil
 fix replacing an existing bones file in wizard mode [load?y, unlink?n, die?y,
 	save?y, replace?y] for configurations using external file compression
 theft of worn armor with wear/unwear delay would interfere with completion of
@@ -872,7 +872,7 @@ data.base "gelatinous cube" and "jack boot" have their own entries
 data.base "vampire bat" matched twice; use the bat entry
 data.base dagger attribution started with spaces instead of tabs
 remove 'if (Deaf)' guards preceding You_hear which already checks deafness
-tse a menu to loot multiple containers
+use a menu to loot multiple containers
 do_look() in post-3.4.3 used glyph prior to setting it in pager.c
 charge for a boulder that fills a pit in shop
 abuse wisdom in keeping with Rider eating message
@@ -985,7 +985,7 @@ burying a punishment ball no longer ends your punishment
 add clicklook option to allow looking at things on the display by clicking 
 	right mouse button when floating mouse pointer over them
 Izchak's lighting store is now able to stock oil for your lamp
-provide core support for saving of messsage history in save file
+provide core support for saving of message history in save file
 the following actions can now be continued after save/restore: digging, 
 	eating, studying, removing armor
 hero-created and monster-created ice will eventually melt away