nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'NetHack-3.6.2'

Browse Source
This commit is contained in:
nhmall
2019-02-23 12:16:13 -05:00
parent 453a2a041d 56a33d43da
commit 42e7f6fcba
8 changed files with 78 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
doc/Guidebook.mn
View File

@@ -1,4 +1,4 @@
.\" $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.296 $ $NHDT-Date: 1549931433 2019/02/12 00:30:33 $
.\" $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.297 $ $NHDT-Date: 1550883608 2019/02/23 01:00:08 $
.\"
.\" This is an excerpt from the 'roff' man page from the 'groff' package.
.\" NetHack's Guidebook.mn currently does *not* adhere to these guidelines.
@@ -636,7 +636,7 @@ Panic button. Quit the game.
.lp d
Drop something.
.lp ""
Ex. \(lqd7a\(rq means drop seven items of object \fIa\fP.
For example \(lqd7a\(rq means drop seven items of object \fIa\fP.
.lp D
Drop several things.
.lp ""
@@ -1068,7 +1068,7 @@ Cast a spell.
Default key is \(oqZ\(cq.
.lp "#chat "
Talk to someone.
Default key is \(oqM-c\)cq.
Default key is \(oqM-c\(cq.
.lp "#close "
Close a door.
Default key is \(oqc\(cq.
@@ -1603,7 +1603,7 @@ straight on, horizontally or vertically. Doorways without doors are
not restricted in this fashion.
.pg
Doors can be useful for shutting out monsters. Most monsters cannot
open doors, although a few don't need to (ex. ghosts can walk through
open doors, although a few don't need to (for example, ghosts can walk through
doors).
.pg
Secret doors are hidden. You can find them with the \(oqs\(cq (search)
@@ -2170,7 +2170,7 @@ leather jacket 9
no armor 10
.TE
.pg
You can also wear other pieces of armor (ex. helmets, boots, shields, cloaks)
You can also wear other pieces of armor (for example helmets, boots, shields, cloaks)
to lower your armor class even further, but you can only wear one item
of each category (one suit of armor, one cloak, one helmet, one
shield, and so on) at a time.
@@ -2223,7 +2223,7 @@ The command to eat food is \(oqe\(cq.
Scrolls (\(oq?\(cq)
.pg
Scrolls are labeled with various titles, probably chosen by ancient wizards
for their amusement value (ex. \(lqREAD ME,\(rq or \(lqTHANX MAUD\(rq
for their amusement value (for example \(lqREAD ME,\(rq or \(lqTHANX MAUD\(rq
backwards).
Scrolls disappear after you read them (except for blank ones, without
magic spells on them).
@@ -2371,7 +2371,7 @@ have a limited number of uses, akin to wand charges. For example, lamps burn
out after a while. Other tools are containers, which objects can
be placed into or taken out of.
.pg
The command to use tools is \(oqa\(cq (apply).
The command to use a tool is \(oqa\(cq (apply).
.hn 3
Containers
.pg
@@ -2876,11 +2876,11 @@ Persistent.
Set the character used to display boulders (default is the \(lqlarge rock\(rq
class symbol, \(oq\`\(cq).
.lp catname
Name your starting cat (ex. \(lqcatname:Morris\(rq).
Name your starting cat (for example \(lqcatname:Morris\(rq).
Cannot be set with the \(oqO\(cq command.
.lp character
Synonym for \(lqrole\(rq to pick the type of your character
(ex. \(lqcharacter:Monk\(rq).
(for example \(lqcharacter:Monk\(rq).
See
.op role
for more details.
@@ -2951,7 +2951,7 @@ Specified categories with omitted prefix implicitly use \(oq+\(cq prefix.
Order of the disclosure categories does not matter, program display for
end-of-game disclosure follows a set sequence.
.lp ""
(ex. \(lqdisclose:yi na +v -g o\(rq)
(for example \(lqdisclose:yi na +v -g o\(rq)
The example sets
\fBinventory\fP to \fIprompt\fP and default to \fIyes\fP,
\fBattributes\fP to \fIprompt\fP and default to \fIno\fP,
@@ -2965,7 +2965,7 @@ traps and each other as well as by you.
And the dungeon overview shows all levels you had visited but does not
reveal things about them that you hadn't discovered.
.lp dogname
Name your starting dog (ex. \(lqdogname:Fang\(rq).
Name your starting dog (for example \(lqdogname:Fang\(rq).
Cannot be set with the \(oqO\(cq command.
.lp extmenu
Changes the extended commands interface to pop-up a menu of available
@@ -2985,7 +2985,7 @@ Persistent.
Commands asking for an inventory item show a menu instead of
a text query with possible menu letters. Default is off.
.lp "fruit "
Name a fruit after something you enjoy eating (ex. \(lqfruit:mango\(rq)
Name a fruit after something you enjoy eating (for example \(lqfruit:mango\(rq)
(default \(lqslime mold\(rq).
Basically a nostalgic whimsy that NetHack uses from time to time.
You should set this to something you find more appetizing than slime mold.
@@ -3036,7 +3036,7 @@ on the top of the pile.
Show a hit point bar graph behind your name and title.
Only available for TTY and Windows GUI, and only when statushilites is on.
.lp horsename
Name your starting horse (ex. \(lqhorsename:Trigger\(rq).
Name your starting horse (for example \(lqhorsename:Trigger\(rq).
Cannot be set with the \(oqO\(cq command.
.lp ignintr
Ignore interrupt signals, including breaks (default off). Persistent.
@@ -3335,7 +3335,7 @@ Persistent.
Make the space bar a synonym for the \(oq.\(cq (#wait) command (default off).
Persistent.
.lp "role "
Pick your type of character (ex. \(lqrole:Samurai\(rq);
Pick your type of character (for example \(lqrole:Samurai\(rq);
synonym for \(lqcharacter\(rq.
See \(lqname\(rq for an alternate method of specifying your role.
Normally only the first letter of the value is examined; \(oqr\(cq is an
@@ -3380,7 +3380,7 @@ Persistent.
Evaluate monsters, objects, and map prior to each turn (default off).
Debug mode only.
.lp scores
Control what parts of the score list you are shown at the end (ex.
Control what parts of the score list you are shown at the end (for example
\(lqscores:5 top scores/4 around my score/own scores\(rq).
Only the first letter of each category (\(oqt\(cq, \(oqa\(cq, or \(oqo\(cq)
is necessary.
@@ -3430,7 +3430,7 @@ Allow updates to the status lines at the bottom of the screen (default true).
.lp suppress_alert
This option may be set to a NetHack version level to suppress
alert notification messages about feature changes for that
and prior versions (ex. \(lqsuppress_alert:3.3.1\(rq).
and prior versions (for example \(lqsuppress_alert:3.3.1\(rq).
.lp symset
This option may be used to select one of the named symbol sets found within
\(lqsymbols\(rq to alter the symbols displayed on the screen.
@@ -3678,7 +3678,7 @@ display quickly and to read the keyboard (allowing the use of arrow
keys to move) on machines with an IBM PC compatible BIOS ROM (default off,
OS/2, PC, and ST NetHack only).
.lp flush
(default off, AMIGA NetHack only).
(default off, Amiga NetHack only).
.lp "MACgraphics"
(default on, Mac NetHack only).
.lp page_wait
@@ -4399,7 +4399,7 @@ s S_spider (arachnid or centipede)
\\ S_throne (opulent throne)
\- S_tlcorn (top left corner)
| S_tlwall (wall)
( S_tool (useful item (pick-axe\, key\, lamp...))
( S_tool (useful item (pick-axe, key, lamp...))
\(ha S_trap_door (trap door)
t S_trapper (trapper or lurker above)
\- S_trcorn (top right corner)
@@ -4877,7 +4877,9 @@ released publicly by other parties. Since that code was a work-in-progress
and had not gone through the process of debugging it as a suitable release,
it was decided that the version numbers present on that code snapshot would
be retired and never used in an official NetHack release. An announcement
was posted on the NetHack Development Team's official nethack.org website to that effect,
was posted on the NetHack Development Team's official
.UR nethack.org
website to that effect,
stating that there would never be a 3.4.4, 3.5, or 3.5.0 official release
version.
.pg
@@ -4933,7 +4935,8 @@ and Integrity (aka Itanium aka IA64) but not VAX.
necessary updates to the community at large.
.pg
The official NetHack web site is maintained by \fBKen Lorber\fP
at http://www.nethack.org/.
at
.UR http://www.nethack.org/ .
.pg
.hn 2
SPECIAL THANKS
@@ -5006,6 +5009,6 @@ J. Ali Harlow Mikko Juola
.\"Microsoft and MS-DOS are registered trademarks of Microsoft Corporation.
.\"Lattice is a trademark of Lattice, Inc.
.\"Atari and 1040ST are trademarks of Atari, Inc.
.\"AMIGA is a trademark of Commodore-Amiga, Inc.
.\"Amiga is a trademark of Commodore-Amiga, Inc
.sm "Brand and product names are trademarks or registered trademarks \
of their respective holders."

28
doc/Guidebook.tex
View File

@@ -761,7 +761,7 @@ Panic button. Quit the game.
%.lp
\item[\tb{d}]
Drop something.\\
{\tt d7a} --- drop seven items of object
For example {\tt d7a} --- drop seven items of object
{\it a}.
%.lp
\item[\tb{D}]
@@ -1767,7 +1767,7 @@ not restricted in this fashion.
%.pg
Doors can be useful for shutting out monsters. Most monsters cannot
open doors, although a few don't need to (ex.\ ghosts can walk through
open doors, although a few don't need to (for example, ghosts can walk through
doors).
%.pg
@@ -2373,7 +2373,7 @@ leather jacket & 9 & & no armor & 10\\
\end{center}
%.pg
\nd You can also wear other pieces of armor (ex.\ helmets, boots,
\nd You can also wear other pieces of armor (for example, helmets, boots,
shields, cloaks)
to lower your armor class even further, but you can only wear one item
of each category (one suit of armor, one cloak, one helmet, one
@@ -2433,7 +2433,7 @@ The command to eat food is `{\tt e}'.
%.pg
Scrolls are labeled with various titles, probably chosen by ancient wizards
for their amusement value (ex.\ ``READ ME,'' or ``THANX MAUD'' backwards).
for their amusement value (for example, ``READ ME,'' or ``THANX MAUD'' backwards).
Scrolls disappear after you read them (except for blank ones, without
magic spells on them).
@@ -3161,11 +3161,11 @@ Set the character used to display boulders (default is the ``large rock''
class symbol, `{\tt `}').
%.lp
\item[\ib{catname}]
Name your starting cat (ex.\ ``{\tt catname:Morris}'').
Name your starting cat (for example, ``{\tt catname:Morris}'').
Cannot be set with the `{\tt O}' command.
%.lp character
\item[\ib{character}]
Pick your type of character (ex.\ ``{\tt character:Monk}'');
Pick your type of character (for example, ``{\tt character:Monk}'');
synonym for ``{\it role\/}''. See {\it role\/} for more details.
%.lp
\item[\ib{checkpoint}]
@@ -3243,7 +3243,7 @@ from high level to low level.\\
.lp ""
%.lp ""
(ex.\ ``{\tt disclose:yi na +v -g o}'')
(for example, ``{\tt disclose:yi na +v -g o}'')
The example sets
{\tt inventory} to {\it prompt\/} and default to {\it yes\/},
{\tt attributes} to {\it prompt\/} and default to {\it no\/},
@@ -3259,7 +3259,7 @@ And the dungeon overview shows all levels you had visited but does not
reveal things about them that you hadn't discovered.
%.lp
\item[\ib{dogname}]
Name your starting dog (ex.\ ``{\tt dogname:Fang}'').
Name your starting dog (for example, ``{\tt dogname:Fang}'').
Cannot be set with the `{\tt O}' command.
%.lp
\item[\ib{extmenu}]
@@ -3282,7 +3282,7 @@ Commands asking for an inventory item show a menu instead of
a text query with possible menu letters. Default is off.
%.lp
\item[\ib{fruit}]
Name a fruit after something you enjoy eating (ex.\ ``{\tt fruit:mango}'')
Name a fruit after something you enjoy eating (for example, ``{\tt fruit:mango}'')
(default ``{\tt slime mold}''). Basically a nostalgic whimsy that
{\it NetHack\/} uses from time to time. You should set this to something you
find more appetizing than slime mold. Apples, oranges, pears, bananas, and
@@ -3331,7 +3331,7 @@ with tiles, generally displays a small plus-symbol beside the object
on the top of the pile.
%.lp
\item[\ib{horsename}]
Name your starting horse (ex.\ ``{\tt horsename:Trigger}'').
Name your starting horse (for example, ``{\tt horsename:Trigger}'').
Cannot be set with the `{\tt O}' command.
%.lp
\item[\ib{hitpointbar}]
@@ -3641,7 +3641,7 @@ Make the space bar a synonym for the `{\tt .}' (\#wait) command (default off).
Persistent.
%.lp
\item[\ib{role}]
Pick your type of character (ex.\ ``{\tt role:Samurai}'');
Pick your type of character (for example, ``{\tt role:Samurai}'');
synonym for ``{\it character\/}''. See ``{\it name\/}'' for an alternate method
of specifying your role. Normally only the first letter of the
value is examined; `r' is an exception with ``{\tt Rogue}'', {\tt Ranger}'',
@@ -3689,7 +3689,7 @@ Prevent you from (knowingly) attacking your pets (default on). Persistent.
+Debug mode only.
%.lp
\item[\ib{scores}]
Control what parts of the score list you are shown at the end (ex.\
Control what parts of the score list you are shown at the end (for example,
``{\tt scores:5top scores/4around my score/own scores}''). Only the first
letter of each category (`{\tt t}', `{\tt a}' or `{\tt o}') is necessary.
Persistent.
@@ -3747,7 +3747,7 @@ Allow updates to the status lines at the bottom of the screen (default true).
\item[\ib{suppress\verb+_+alert}]
This option may be set to a {\it NetHack\/} version level to suppress
alert notification messages about feature changes for that
and prior versions (ex.\ ``{\tt suppress\verb+_+alert:3.3.1}'')
and prior versions (for example, ``{\tt suppress\verb+_+alert:3.3.1}'')
%.lp
\item[\ib{symset}]
This option may be used to select one of the named symbol sets found within
@@ -5589,7 +5589,7 @@ J. Ali Harlow & Mikko Juola
%UNIX is a registered trademark of AT\&T.\\
%Lattice is a trademark of Lattice, Inc.\\
%Atari and 1040ST are trademarks of Atari, Inc.\\
%AMIGA is a trademark of Commodore-Amiga, Inc.\\
%Amiga is a trademark of Commodore-Amiga, Inc.\\
%%.sm
%Brand and product names are trademarks or registered trademarks
%of their respective holders.

12
doc/fixes36.2
View File

@@ -1,4 +1,4 @@
$NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.261 $ $NHDT-Date: 1550800390 2019/02/22 01:53:10 $
$NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.262 $ $NHDT-Date: 1550868876 2019/02/22 20:54:36 $
This fixes36.2 file is here to capture information about updates in the 3.6.x
lineage following the release of 3.6.1 in April 2018. Please note, however,
@@ -373,11 +373,11 @@ when donning armor, defer flagging its +/- value--which can be deduced from
then (player might still deduce the +/- value but hero won't learn it)
a monster with resistances supplied by worn armor would lose them if that
monster went through a shape change even if the armor stayed worn
after using 'f' to fire/throw with autoquiver enabled and numpad off, then
using ^A to repeat, if ammo was just used up and there's nothing
suitable to autoquiver it would pick the item in the inventory slot
corresponding to the direction letter from preceding 'fire' (and if
there was such an item, then ask for direction since ^A data ran out)
when using 'f' to fire/throw--and possibly some ^A's to repeat--then running
out of ammo (with either 'autoquiver' off or nothing suitable to put
in quiver), using ^A would put whichever inventory item was assigned
the same letter as the prior direction into quiver slot (unless item
was already worn or wielded) and then ask for a direction to fire it
early rolling boulder trap lacking any boulder might still have the corpse
of a dead adventurer

5
doc/tmac.nh
View File

@@ -123,5 +123,10 @@
.sn \\n(bRu
.br
..
.\" .UR url
.\" Just a pass-through here; converted to a link when generating HTML.
.de UR
\\$1\\$2
..
.
.\"tmac.nh/"

10
src/dothrow.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 dothrow.c $NHDT-Date: 1550784489 2019/02/21 21:28:09 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.157 $ */
/* NetHack 3.6 dothrow.c $NHDT-Date: 1550868876 2019/02/22 20:54:36 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.158 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2013. */
/* NetHack may be freely redistributed. See license for details. */
@@ -380,10 +380,12 @@ dofire()
You("have nothing appropriate for your quiver.");
}
/* if autoquiver is disabled or has failed, prompt for missile;
fill quiver with it if it's not wielded */
fill quiver with it if it's not wielded or worn */
if (!obj) {
/* direction of previous throw is not suitable answer here */
g.in_doagain = FALSE;
/* in case we're using ^A to repeat prior 'f' command, don't
use direction of previous throw as getobj()'s choice here */
g.in_doagain = 0;
/* choose something from inventory, then usually quiver it */
obj = getobj(uslinging() ? bullets : toss_objs, "throw");
/* Q command doesn't allow gold in quiver */
if (obj && !obj->owornmask && obj->oclass != COIN_CLASS)

2
src/mklev.c
View File

@@ -1400,7 +1400,7 @@ coord *tm;
in a pit and yet not be able to identify that the pit is there. */
if (kind != NO_TRAP && lvl <= (unsigned) rnd(4)
&& kind != SQKY_BOARD && kind != RUST_TRAP
/* rolling bounder trap might not have a boulder if there was no
/* rolling boulder trap might not have a boulder if there was no
viable path (such as when placed in the corner of a room), in
which case tx,ty==launch.x,y; no boulder => no dead predecessor */
&& !(kind == ROLLING_BOULDER_TRAP

8
sys/unix/Makefile.src
View File

@@ -1,5 +1,5 @@
# NetHack Makefile.
# NetHack 3.6 Makefile.src $NHDT-Date: 1549834883 2019/02/10 21:41:23 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.69 $
# NetHack 3.6 Makefile.src $NHDT-Date: 1550876124 2019/02/22 22:55:24 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.70 $
# Copyright (c) 2018 by Pasi Kallinen
# NetHack may be freely redistributed. See license for details.
@@ -471,7 +471,7 @@ WINCSRC = $(WINTTYSRC) $(WINCURSESSRC) $(WINX11SRC) $(WINGNOMESRC) $(WINGEMSRC)
# all windowing-system-dependent .cpp (for dependencies and such)
WINCXXSRC = $(WINQTSRC) $(WINQT4SRC) $(WINBESRC)
# Files for window system chaining. Requires SYSCF; include via HINTSRC/HINTOBJ
# Files for window system chaining. Requires SYSCF; include via HINTSRC/HINTOBJ
CHAINSRC = ../win/chain/wc_chainin.c ../win/chain/wc_chainout.c \
../win/chain/wc_trace.c
CHAINOBJ = wc_chainin.o wc_chainout.o wc_trace.o
@@ -496,9 +496,9 @@ HACKINCL = align.h amiconf.h artifact.h artilist.h attrib.h beconf.h botl.h \
os2conf.h patchlevel.h pcconf.h permonst.h prop.h rect.h region.h \
rm.h sp_lev.h spell.h sys.h system.h tcap.h timeout.h tosconf.h \
tradstdc.h trampoli.h trap.h unixconf.h vision.h vmsconf.h wintty.h \
winX.h winprocs.h wintype.h you.h youprop.h
wincurs.h winX.h winprocs.h wintype.h you.h youprop.h
HSOURCES = $(HACKINCL) date.h onames.h pm.h vis_tab.h\
HSOURCES = $(HACKINCL) date.h onames.h pm.h vis_tab.h \
lev_comp.h dgn_comp.h dgn_file.h
# the following .o's _must_ be made before any others (for makedefs)

20
sys/vms/Makefile.src
View File

@@ -1,5 +1,5 @@
# NetHack Makefile (VMS) - for building nethack itself.
# NetHack 3.6 Makefile.src $NHDT-Date: 1550360058 2019/02/16 23:34:18 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.34 $
# NetHack 3.6 Makefile.src $NHDT-Date: 1550876198 2019/02/22 22:56:38 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.35 $
# Copyright (c) 2011 by Robert Patrick Rankin
# NetHack may be freely redistributed. See license for details.
@@ -384,12 +384,28 @@ random.c : $(SYSSHR)random.c
tclib.obj : tclib.c $(CONFIG_H)
tclib.c : $(SYSSHR)tclib.c
copy $(SYSSHR)tclib.c tclib.c
# user interface code -- VMS uses tty (1st 4) only
# user interface code -- VMS uses tty or curses or both, not X11
getline.obj : $(TTY)getline.c $(HACK_H) $(INC)func_tab.h
termcap.obj : $(TTY)termcap.c $(HACK_H) $(INC)tcap.h
topl.obj : $(TTY)topl.c $(HACK_H) $(INC)tcap.h
wintty.obj : $(TTY)wintty.c $(HACK_H) $(INC)dlb.h \
$(INC)date.h $(INC)patchlevel.h $(INC)tcap.h
cursmain.obj : $(CURSES)cursmain.c $(HACK_H) $(INC)patchlevel.h \
$(INC)wincurs.h
curswins.obj : $(CURSES)curswins.c $(HACK_H) $(INC)wincurs.h \
$(CURSES)curswins.h
cursmisc.obj : $(CURSES)cursmisc.c $(HACK_H) $(INC)wincurs.h \
$(CURSES)cursmisc.h $(INC)func_tab.h $(INC)dlb.h
cursdial.obj : $(CURSES)cursdial.c $(HACK_H) $(INC)wincurs.h \
$(CURSES)cursdial.h ../include/func_tab.h
cursstat.obj : $(CURSES)cursstat.c $(HACK_H) $(INC)wincurs.h \
$(CURSES)cursstat.h
cursinit.obj : $(CURSES)cursinit.c $(HACK_H) $(INC)wincurs.h \
$(CURSES)cursinit.h
cursmesg.obj : $(CURSES)cursmesg.c $(HACK_H) $(INC)wincurs.h \
$(CURSES)cursmesg.h
cursinvt.obj : $(CURSES)cursinvt.c $(HACK_H) $(INC)wincurs.h \
$(CURSES)cursinvt.h
Window.obj : $(X11)Window.c $(INC)xwindowp.h $(INC)xwindow.h $(CONFIG_H)
dialogs.obj : $(X11)dialogs.c $(CONFIG_H)
winX.obj : $(X11)winX.c $(HACK_H) $(INC)winX.h $(INC)dlb.h \