Merge branch 'NetHack-3.6'
This commit is contained in:
nhmall
+12
-2
@@ -1,4 +1,4 @@
|
||||
.\" $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.331 $ $NHDT-Date: 1573943499 2019/11/16 22:31:39 $
|
||||
.\" $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.333 $ $NHDT-Date: 1574900824 2019/11/28 00:27:04 $
|
||||
.\"
|
||||
.\" This is an excerpt from the 'roff' man page from the 'groff' package.
|
||||
.\" NetHack's Guidebook.mn currently does *not* adhere to these guidelines.
|
||||
@@ -24,7 +24,7 @@
|
||||
.ds vr "NetHack 3.7
|
||||
.ds f0 "\*(vr
|
||||
.ds f1
|
||||
.ds f2 "November 17, 2019
|
||||
.ds f2 "November 27, 2019
|
||||
.
|
||||
.\" A note on some special characters:
|
||||
.\" \(lq = left double quote
|
||||
@@ -693,6 +693,14 @@ Normally checks for edible item(s) on the floor, then if none are found
|
||||
or none are chosen, checks for edible item(s) in inventory.
|
||||
Precede \(oqe\(cq with the \(oqm\(cq prefix to bypass attempting to eat
|
||||
anything off the floor.
|
||||
.lp ""
|
||||
If you attempt to eat while already satiated, you might choke to death.
|
||||
If you risk it, you will be asked whether
|
||||
to \(lqcontinue eating?\(rq \fIif you survive the first bite\fP.
|
||||
You can set the
|
||||
.op paranoid_confirmation:eating
|
||||
option to require a response of \f(CRyes\fP instead of just \f(CRy\fP.
|
||||
.
|
||||
.\" Make sure Elbereth is not hyphenated below, the exact spelling matters
|
||||
.hw Elbereth
|
||||
.lp E
|
||||
@@ -3307,6 +3315,8 @@ bones data when dying in debug mode;
|
||||
require \(lqyes\(rq rather than \(oqy\(cq to confirm attacking a peaceful monster;
|
||||
.PL wand-break
|
||||
require \(lqyes\(rq rather than \(oqy\(cq to confirm breaking a wand;
|
||||
.PL eating
|
||||
require \(lqyes\(rq rather than \(oqy\(cq to confirm whether to continue eating;
|
||||
.PL Were-change
|
||||
require \(lqyes\(rq rather than \(oqy\(cq to confirm changing form due to lycanthropy
|
||||
when hero has polymorph control;
|
||||
|
||||
+13
-3
@@ -45,7 +45,7 @@
|
||||
%.au
|
||||
\author{Original version - Eric S. Raymond\\
|
||||
(Edited and expanded for 3.6 by Mike Stephenson and others)}
|
||||
\date{November 17, 2019}
|
||||
\date{November 27, 2019}
|
||||
|
||||
\maketitle
|
||||
|
||||
@@ -796,7 +796,14 @@ Eat food.\\
|
||||
Normally checks for edible item(s) on the floor, then if none are found
|
||||
or none are chosen, checks for edible item(s) in inventory.
|
||||
Precede `{\tt e}' with the `{\tt m}' prefix to bypass attempting to eat
|
||||
anything off the floor.
|
||||
anything off the floor.\\
|
||||
%.lp ""
|
||||
If you attempt to eat while already satiated, you might choke to death.
|
||||
If you risk it, you will be asked whether
|
||||
to ``continue eating?'' {\it if you survive the first bite\/}.
|
||||
You can set the
|
||||
{\it paranoid\verb+_+confirmation:eating\/}
|
||||
option to require a response of ``{\tt yes}'' instead of just `{\tt y}'.
|
||||
%.lp
|
||||
% Make sure Elbereth is not hyphenated below, the exact spelling matters.
|
||||
% (Only specified here to parallel Guidebook.mn; use of \tt font implicity
|
||||
@@ -1333,7 +1340,7 @@ Autocompletes.
|
||||
Debug mode only.\\
|
||||
%.lp ""
|
||||
Asks for confirmation; default is `{\tt n}' (no); continue playing.
|
||||
To really panic, respond with `{\tt y}''.
|
||||
To really panic, respond with `{\tt y}'.
|
||||
You can set the
|
||||
{\it paranoid\verb+_+confirmation:quit\/}
|
||||
option to require a response of ``{\tt yes}'' instead.
|
||||
@@ -3640,6 +3647,9 @@ a peaceful monster;
|
||||
\item[{\tt wand-break}]
|
||||
require ``{\tt yes}'' rather than `{\tt y}' to confirm breaking
|
||||
a wand;
|
||||
\item[{\tt eating}]
|
||||
require ``{\tt yes}'' rather than `{\tt y}' to confirm whether to
|
||||
continue eating;
|
||||
\item[{\tt Were-change}]
|
||||
require ``{\tt yes}'' rather than `{\tt y}' to confirm changing form
|
||||
due to lycanthropy
|
||||
|
||||
+10
-1
@@ -1,4 +1,4 @@
|
||||
$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.191 $ $NHDT-Date: 1574722861 2019/11/25 23:01:01 $
|
||||
$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.192 $ $NHDT-Date: 1574882658 2019/11/27 19:24:18 $
|
||||
|
||||
This fixes36.3 file is here to capture information about updates in the 3.6.x
|
||||
lineage following the release of 3.6.2 in May 2019. Please note, however,
|
||||
@@ -306,6 +306,14 @@ look-at of mimics mimicking altars got an arbitary alignment from misuse of
|
||||
underlying terrain
|
||||
polymorph_sink creating an altar passed a call to rn2() as an argument to a
|
||||
macro which evaluates its parameter more than once
|
||||
if a monster (presumably sensed but not seen) was displayed at a location
|
||||
showing "remembered, unseen monster", remove that since hero now knows
|
||||
something else is there (3.6.1 had similar fix for warned-of monsters)
|
||||
clairvoyance showed all monsters in range, then after player viewed the map,
|
||||
replaced them with "remembered, unseen monster" glyph and finally
|
||||
did a normal monster refresh; the 'I' glyph step clobbers remembered
|
||||
object at same spot, so skip it for locations where monster refresh
|
||||
is going to immediately redisplay a monster
|
||||
unix: fix double DLB definition in linux hints file
|
||||
windows: fix --showpaths output for the data file which relies on being
|
||||
constructed programmatically to incorporate the version suffix
|
||||
@@ -471,6 +479,7 @@ add a couple of engraving suggestions in pull request #79
|
||||
chasonr's faster method to write characters to msdos VGA in pull request #220
|
||||
chasonr's msdos Makefile.gcc pdcurses build changes in pull request #243
|
||||
autopickup exception priority change in pull request #226
|
||||
FIQ's curses (PDCurses) number pad changes in pull request #247
|
||||
|
||||
|
||||
Code Cleanup and Reorganization
|
||||
|
||||
Reference in New Issue
Block a user