Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2

This commit is contained in:
nhmall
2018-09-20 18:45:08 -04:00
68 changed files with 765 additions and 294 deletions

View File

@@ -1452,7 +1452,7 @@ be automatically turned off.
\item[\tb{\#untrap}]
Untrap something (trap, door, or chest). Default key is '{\tt M-u}', and '{\tt u}' if {\it number\verb+_+pad\/} is on.
%.lp ""
In some circumstancs it can also be used to rescue trapped monsters.
In some circumstances it can also be used to rescue trapped monsters.
%.lp
\item[\tb{\#up}]
Go up a staircase. Default key is '{\tt <}'.
@@ -1830,7 +1830,7 @@ The {\tt Ix} command shows an inventory-like display of any unpaid
items which have been used up, along with other shop fees, if any.
%.hn 3
\subsubsection*{Shop idiosyncracies}
\subsubsection*{Shop idiosyncrasies}
%.pg
Several aspects of shop behavior might be unexpected.
@@ -2848,23 +2848,23 @@ so setting HACKDIR to override that is not usually necessary or recommended.
%.lp
\item[\bb{LEVELDIR}]
The location that in-progress level files are stored. Defaults to HACKDIR,
must be writeable.
must be writable.
%.lp
\item[\bb{SAVEDIR}]
The location where saved games are kept. Defaults to HACKDIR, must be
writeable.
writable.
%.lp
\item[\bb{BONESDIR}]
The location that bones files are kept. Defaults to HACKDIR, must be
writeable.
writable.
%.lp
\item[\bb{LOCKDIR}]
The location that file synchronization locks are stored. Defaults to
HACKDIR, must be writeable.
HACKDIR, must be writable.
%.lp
\item[\bb{TROUBLEDIR}]
The location that a record of game aborts and self-diagnosed game problems
is kept. Defaults to HACKDIR, must be writeable.
is kept. Defaults to HACKDIR, must be writable.
%.lp
\item[\bb{AUTOCOMPLETE}]
Enable or disable an extended command autocompletion.
@@ -3501,7 +3501,6 @@ such as ``{\it par\-a\-noid\verb+_+con\-fir\-ma\-tion:attack~pray~Remove}''.
\item[\ib{perm\verb+_+invent}]
If true, always display your current inventory in a window. This only
makes sense for windowing system interfaces that implement this feature.
Persistent.
%.lp
\item[\ib{pettype}]
Specify the type of your initial pet, if you are playing a character class