Merge remote-tracking branch 'origin/NetHack-3.6.0'

This commit is contained in:
keni
2018-03-10 19:14:11 -05:00
65 changed files with 1528 additions and 526 deletions

View File

@@ -4292,46 +4292,36 @@ in this, the list of Dungeoneers:
center;
c c c.
.\"TABLE_START
Adam Aronow Janet Walz Nathan Eady
Alex Kompel Janne Salmijarvi Norm Meluch
Andreas Dorn Jean-Christophe Collet Olaf Seibert
Andy Church Jeff Bailey Pasi Kallinen
Andy Swanson Jochen Erwied Pat Rankin
Ari Huttunen John Kallen Paul Winner
Barton House John Rupley Pierre Martineau
Benson I. Margulies John S. Bien Ralf Brown
Bill Dyer Johnny Lee Ray Chason
Boudewijn Waijers Jon W{tte Richard Addison
Bruce Cox Jonathan Handler Richard Beigel
Bruce Holloway Joshua Delahunty Richard P. Hughey
Bruce Mewborne Keizo Yamamoto Rob Menke
Carl Schelin Ken Arnold Robin Bandy
Chris Russo Ken Arromdee Robin Johnson
David Cohrs Ken Lorber Roderick Schertler
David Damerell Ken Washikita Roland McGrath
David Gentzel Kevin Darcy Ron Van Iwaarden
David Hairston Kevin Hugo Ronnen Miller
Dean Luick Kevin Sitze Ross Brown
Del Lamb Kevin Smolkowski Sascha Wostmann
Derek S. Ray Kevin Sweet Scott Bigham
Deron Meranda Lars Huttar Scott R. Turner
Dion Nicolaas Leon Arnott Sean Hunt
Dylan O'Donnell M. Drew Streib Stephen Spackman
Eric Backus Malcolm Ryan Stefan Thielscher
Eric Hendrickson Mark Gooderum Stephen White
Eric R. Smith Mark Modrall Steve Creps
Eric S. Raymond Marvin Bressler Steve Linhart
Erik Andersen Matthew Day Steve VanDevender
Frederick Roeber Merlyn LeRoy Teemu Suikki
Gil Neiger Michael Allison Tim Lennan
Greg Laskin Michael Feir Timo Hakulinen
Greg Olson Michael Hamel Tom Almy
Gregg Wonderly Michael Sokolov Tom West
Hao-yang Wang Mike Engber Warren Cheung
Helge Hafting Mike Gallop Warwick Allison
Irina Rempt-Drijfhout Mike Passaretti Yitzhak Sapir
Izchak Miller Mike Stephenson
J. Ali Harlow Mikko Juola
Adam Aronow Erik Andersen Kevin Sitze Ray Chason
Alex Kompel Frederick Roeber Kevin Smolkowski Richard Addison
Alex Smith Gil Neiger Kevin Sweet Richard Beigel
Andreas Dorn Greg Laskin Lars Huttar Richard P. Hughey
Andy Church Greg Olson Leon Arnott Rob Menke
Andy Swanson Gregg Wonderly M. Drew Streib Robin Bandy
Ari Huttunen Hao-yang Wang Malcolm Ryan Robin Johnson
Barton House Helge Hafting Mark Gooderum Roderick Schertler
Benson I. Margulies Irina Rempt-Drijfhout Mark Modrall Roland McGrath
Bill Dyer Izchak Miller Marvin Bressler Ron Van Iwaarden
Boudewijn Waijers J. Ali Harlow Matthew Day Ronnen Miller
Bruce Cox Janet Walz Merlyn LeRoy Ross Brown
Bruce Holloway Janne Salmijarvi Michael Allison Sascha Wostmann
Bruce Mewborne Jean-Christophe Collet Michael Feir Scott Bigham
Carl Schelin Jeff Bailey Michael Hamel Scott R. Turner
Chris Russo Jochen Erwied Michael Sokolov Sean Hunt
David Cohrs John Kallen Mike Engber Stephen Spackman
David Damerell John Rupley Mike Gallop Stefan Thielscher
David Gentzel John S. Bien Mike Passaretti Stephen White
David Hairston Johnny Lee Mike Stephenson Steve Creps
Dean Luick Jon W{tte Mikko Juola Steve Linhart
Del Lamb Jonathan Handler Nathan Eady Steve VanDevender
Derek S. Ray Joshua Delahunty Norm Meluch Teemu Suikki
Deron Meranda Keizo Yamamoto Olaf Seibert Tim Lennan
Dion Nicolaas Ken Arnold Pasi Kallinen Timo Hakulinen
Dylan O'Donnell Ken Arromdee Pat Rankin Tom Almy
Eric Backus Ken Lorber Patric Mueller Tom West
Eric Hendrickson Ken Washikita Paul Winner Warren Cheung
Eric R. Smith Kevin Darcy Pierre Martineau Warwick Allison
Eric S. Raymond Kevin Hugo Ralf Brown Yitzhak Sapir
.\"TABLE_END Do not delete this line.
.TE

View File

@@ -5236,36 +5236,36 @@ in this, the list of Dungeoneers:
\begin{center}
\begin{tabular}{llll}
%TABLE_START
Adam Aronow & Frederick Roeber & Kevin Smolkowski & Richard Beigel\\
Alex Kompel & Gil Neiger & Kevin Sweet & Richard P. Hughey\\
Andreas Dorn & Greg Laskin & Lars Huttar & Rob Menke\\
Andy Church & Greg Olson & Leon Arnott & Robin Bandy\\
Andy Swanson & Gregg Wonderly & M. Drew Streib & Robin Johnson\\
Ari Huttunen & Hao-yang Wang & Malcolm Ryan & Roderick Schertler\\
Barton House & Helge Hafting & Mark Gooderum & Roland McGrath\\
Benson I. Margulies & Irina Rempt-Drijfhout & Mark Modrall & Ron Van Iwaarden\\
Bill Dyer & Izchak Miller & Marvin Bressler & Ronnen Miller\\
Boudewijn Waijers & J. Ali Harlow & Matthew Day & Ross Brown\\
Bruce Cox & Janet Walz & Merlyn LeRoy & Sascha Wostmann\\
Bruce Holloway & Janne Salmij\"{a}rvi & Michael Allison & Scott Bigham\\
Bruce Mewborne & Jean-Christophe Collet & Michael Feir & Scott R. Turner\\
Carl Schelin & Jeff Bailey & Michael Hamel & Sean Hunt\\
Chris Russo & Jochen Erwied & Michael Sokolov & Stephen Spackman\\
David Cohrs & John Kallen & Mike Engber & Stefan Thielscher\\
David Damerell & John Rupley & Mike Gallop & Stephen White\\
David Gentzel & John S. Bien & Mike Passaretti & Steve Creps\\
David Hairston & Johnny Lee & Mike Stephenson & Steve Linhart\\
Dean Luick & Jon W\{tte & Mikko Juola & Steve VanDevender\\
Del Lamb & Jonathan Handler & Nathan Eady & Teemu Suikki\\
Derek S. Ray & Joshua Delahunty & Norm Meluch & Tim Lennan\\
Deron Meranda & Keizo Yamamoto & Olaf Seibert & Timo Hakulinen\\
Dion Nicolaas & Ken Arnold & Pasi Kallinen & Tom Almy\\
Dylan O'Donnell & Ken Arromdee & Pat Rankin & Tom West\\
Eric Backus & Ken Lorber & Paul Winner & Warren Cheung\\
Eric Hendrickson & Ken Washikita & Pierre Martineau & Warwick Allison\\
Eric R. Smith & Kevin Darcy & Ralf Brown & Yitzhak Sapir\\
Eric S. Raymond & Kevin Hugo & Ray Chason\\
Erik Andersen & Kevin Sitze & Richard Addison
Adam Aronow & Erik Andersen & Kevin Sitze & Ray Chason\\
Alex Kompel & Frederick Roeber & Kevin Smolkowski & Richard Addison\\
Alex Smith & Gil Neiger & Kevin Sweet & Richard Beigel\\
Andreas Dorn & Greg Laskin & Lars Huttar & Richard P. Hughey\\
Andy Church & Greg Olson & Leon Arnott & Rob Menke\\
Andy Swanson & Gregg Wonderly & M. Drew Streib & Robin Bandy\\
Ari Huttunen & Hao-yang Wang & Malcolm Ryan & Robin Johnson\\
Barton House & Helge Hafting & Mark Gooderum & Roderick Schertler\\
Benson I. Margulies & Irina Rempt-Drijfhout & Mark Modrall & Roland McGrath\\
Bill Dyer & Izchak Miller & Marvin Bressler & Ron Van Iwaarden\\
Boudewijn Waijers & J. Ali Harlow & Matthew Day & Ronnen Miller\\
Bruce Cox & Janet Walz & Merlyn LeRoy & Ross Brown\\
Bruce Holloway & Janne Salmij\"{a}rvi & Michael Allison & Sascha Wostmann\\
Bruce Mewborne & Jean-Christophe Collet & Michael Feir & Scott Bigham\\
Carl Schelin & Jeff Bailey & Michael Hamel & Scott R. Turner\\
Chris Russo & Jochen Erwied & Michael Sokolov & Sean Hunt\\
David Cohrs & John Kallen & Mike Engber & Stephen Spackman\\
David Damerell & John Rupley & Mike Gallop & Stefan Thielscher\\
David Gentzel & John S. Bien & Mike Passaretti & Stephen White\\
David Hairston & Johnny Lee & Mike Stephenson & Steve Creps\\
Dean Luick & Jon W\{tte & Mikko Juola & Steve Linhart\\
Del Lamb & Jonathan Handler & Nathan Eady & Steve VanDevender\\
Derek S. Ray & Joshua Delahunty & Norm Meluch & Teemu Suikki\\
Deron Meranda & Keizo Yamamoto & Olaf Seibert & Tim Lennan\\
Dion Nicolaas & Ken Arnold & Pasi Kallinen & Timo Hakulinen\\
Dylan O'Donnell & Ken Arromdee & Pat Rankin & Tom Almy\\
Eric Backus & Ken Lorber & Patric Mueller & Tom West\\
Eric Hendrickson & Ken Washikita & Paul Winner & Warren Cheung\\
Eric R. Smith & Kevin Darcy & Pierre Martineau & Warwick Allison\\
Eric S. Raymond & Kevin Hugo & Ralf Brown & Yitzhak Sapir
%TABLE_END Do not delete this line.
\end{tabular}
\end{center}

View File

@@ -190,7 +190,7 @@ grammar bit when hallucinating: "you kill poor goblin" ('the' missing for pet)
some blindness cures ignored u.ucreamed
some instances of stun or confusion timers were being overridden rather than
incremented when new stun or confusion damage was suffered
female gnome who gains level can grow up into male-only gnome lord; give an
female gnome who gains level can grow up into male-only gnome lord; give
an alternate message instead of prohibiting the promotion
kicked weapon which successfully hits monster vanishes from play
unseen landmine explosion could result in "The <monst-type> statue crumbles."
@@ -295,7 +295,7 @@ don't give "you cannot pass through the bars" when travel is testing possible
paths in the vicinity of iron bars
if blind and no gloves, using 'm<dir>' to move and then 'e' could be used to
locate cockatrice corpse without fatal touching (by declining to eat)
it's cannabilism for a were<foo> to eat a <foo> corpse
it's cannibalism for a were<foo> to eat a <foo> corpse
conduct: wishing for an artifact and not getting it because it already exists
counts as wishing for an artifact, just like when not getting it
because of quest restrictions or too many artifacts in play does
@@ -304,7 +304,7 @@ gelatinous cube shouldn't be able to eat a scroll of scare monster
make fireballs or cones of cold cast at skilled or higher not go through walls
prevent flying monsters from hovering over unreachable underwater objects
lembas wafer gives increased nutrition to elves, reduced nutrition to orcs;
cram ration gives increase nutrition to dwarves
cram ration gives increased nutrition to dwarves
when #tip's terse object drop format got interrupted by a regular message,
it continued using "obj2, obj3, ..." for subsequent objects, where
the sentence grammar no longer made sense (the interrupting message
@@ -414,6 +414,7 @@ surviving a gas spore's explosion would leave that explosion as a stale reason
for death which might show up strangely ("crushed to death by a gas
spore's explosion" when killed by an opening drawbridge)
add database entry for "martial arts"
add catch-all database entry for the polearms
starting inventory for rogues specified +9 lock pick, where +/-N is meaningless
fix pile mark when picking up all-but-one items while invisible
improve config file error reporting
@@ -509,8 +510,17 @@ the Wizard, Angels and lawful minions, the Riders, shopkeep/priest in own room
are never frightened by tooled horns
'Iu' would reveal unknown container contents if carrying one unpaid item inside
a hero-owned container whose contents weren't known
docall wasn't taking the space allocation needed for the object name + "Call :"
into account in the prompt string
docall for type of object could overflow its prompt buffer if there was a very
long type name previously assigned
whatis lookup for 'more info?' would behave strangely for plural names, either
entered by player or from "N foo" stacks on the map
you should not hear a whistle if you are deaf
change the deity's "congratulations" message upon ascension to something which
sounds a bit more archaic to fit better with the other messages
prayer boon of 'fix all troubles' could get stuck in an infinite loop for
TROUBLE_STUCK_IN_WALL if there was no spot to teleport into available
It shouldn't be considered hypocrisy if you speed up your pet while standing
on Elbereth
Fixes to Post-3.6.0 Problems that Were Exposed Via git Repository
@@ -576,6 +586,9 @@ try again to fix achievement recording bug with mines and sokoban prizes
the fix for secret doors on special levels always having vertical orientation
resulted in some--but not all--secret doors within vertical walls
being displayed as horizontal walls while still hidden
and the previous fix for the for secret doors didn't work if the level hadn't
been wallified yet (Cav quest) so horizontal wall with secret door
mis-displayed as a vertical wall segment could occur
the fix intended for "a shop object stolen from outside the shop (via
grappling hook) would be left marked as 'unpaid'" broke normal pickup,
preventing any picked up item from merging with compatible stack
@@ -584,6 +597,11 @@ unix: fix for freeing MAIL introduced a one-byte buffer overrun which could
interfere with malloc/free operation
unix: fix for freeing MAIL also introduced a memory leak whenever new mail
is detected and MAIL comes from the environment
when clairvoyance lets you move the cursor to examine the map (if it occurs
when engulfed or underwater or when blessed clairvoyance finds a
monster), the "for instructions type '?'" prompt could be confusing
prevent Mjollnir from being auto-quivered if it's been thrown without return
and then picked back up while quiver slot is empty
Platform- and/or Interface-Specific Fixes
@@ -621,6 +639,8 @@ unix: race condition with parallel make: src/Makefile might start building
unix: Makefile.{src,utl} ignored CPPFLAGS which is expanded by the default .c
rule by GNU make so if user had a value for that in the environment,
it would apply to some files but not others; explicitly override it
unix: enable code guarded by USE_WIN_IOCTL by default unless prevented by
uncommenting #define AVOID_WIN_IOCTL in include/unixconf.h
win32gui: getversionstring() was overflowing the provided Help About buffer
win32gui: guard against buffer overflow in in mswin_getlin()
win32gui: handle menu_color attribute
@@ -774,6 +794,9 @@ change #adjust's behavior when collecting compatible stacks; that used to
a prayer result which results in uncursing some or all of the hero's items
won't uncurse a worn helm of opposite alignment since that would
facilitate the hero switching to another god by taking it off
wielded aklys behaves like Mjollnir when thrown--it usually returns; unlike
Mjollnir, it isn't limited to Valkyries or need gauntlets of power
(so far, hero-only; an aklys won't return if thrown by a monster)
Platform- and/or Interface-Specific New Features

View File

@@ -85,6 +85,14 @@ Generate
.I date.h
and
.I options
file. It will read
.I dat/gitinfo.txt
,only if it is present, to obtain
.B githash=
and
.B gitbranch=
info and include related preprocessor #defines in
.I date.h
file.
.br
.TP

View File

@@ -1,5 +1,5 @@
.TH NETHACK 6 "7 December 2015"
.\" NetHack 3.6 nethack.6 $NHDT-Date: 1449616496 2015/12/08 23:14:56 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.11 $
.\" NetHack 3.6 nethack.6 $NHDT-Date: 1519228609 2018/02/21 15:56:49 $ $NHDT-Branch: githash $:$NHDT-Revision: 1.13 $
.SH NAME
nethack \- Exploring The Mazes of Menace
.SH SYNOPSIS
@@ -34,6 +34,9 @@ nethack \- Exploring The Mazes of Menace
[
.B \-ibm
]
[
.BR \-\-version [ :paste ]
]
.PP
.B nethack
[
@@ -207,6 +210,17 @@ The playground must contain several auxiliary files such as help files,
the list of top scorers, and a subdirectory
.I save
where games are saved.
.PP
.B \-\-version
can be used to cause NetHack to show the version information it
was compiled with, then exit. That will include the
.I git
commit hash if the information was available when the game was compiled.
On some platforms, such as windows and macosx, a variation
.B \-\-version:paste
can be used to cause NetHack to show the version information, then exit,
while also leaving a copy of the version information in the paste buffer
or clipboard for potential insertion into things like bug reports.
.SH AUTHORS
.PP
Jay Fenlason (+ Kenny Woodland, Mike Thome and Jon Payne) wrote the

View File

@@ -7,7 +7,7 @@ NAME
SYNOPSIS
nethack [ -d directory ] [ -n ] [ -p profession ] [ -r race ] [ -[DX] ]
[ -u playername ] [ -dec ] [ -ibm ]
[ -u playername ] [ -dec ] [ -ibm ] [ --version[:paste] ]
nethack [ -d directory ] -s [ -v ] [ -p profession ] [ -r race ] [
playernames ]