Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource into paxed-new_lev_comp
Conflicts: src/trap.c sys/winnt/Makefile.msc
This commit is contained in:
Pasi Kallinen
6
dat/.gitattributes
vendored
6
dat/.gitattributes
vendored
@@ -1,3 +1,3 @@
|
||||
*.def filter=NHtext merge=NHsubst
|
||||
*.des filter=NHtext merge=NHsubst
|
||||
*.txt filter=NHtext merge=NHsubst
|
||||
*.def NHSUBST
|
||||
*.des NHSUBST
|
||||
*.txt NHSUBST
|
||||
|
||||
1
dat/.gitignore
vendored
1
dat/.gitignore
vendored
@@ -20,3 +20,4 @@ nhdat
|
||||
dlb.lst
|
||||
guioptions
|
||||
porthelp
|
||||
NetHack.ad
|
||||
|
||||
@@ -245,6 +245,9 @@ flying pig
|
||||
hippocampus
|
||||
hippogriff
|
||||
kelpie
|
||||
catoblepas
|
||||
phoenix
|
||||
amphisbaena
|
||||
|
||||
# Unusually animate body parts
|
||||
bouncing eye
|
||||
|
||||
@@ -5321,6 +5321,22 @@ web
|
||||
Oh what a tangled web we weave,
|
||||
When first we practise to deceive!
|
||||
[ Marmion, by Sir Walter Scott ]
|
||||
whistle
|
||||
There were legends both on the front and on the back of the
|
||||
whistle. The one read thus:
|
||||
|
||||
FLA FUR BIS FLE The other: QUIS EST ISTE QUI VENIT
|
||||
'I ought to be able to make it out,' he thought;
|
||||
'but I suppose I am a little rusty in my Latin.
|
||||
When I come to think of it, I don't believe I even
|
||||
know the word for a whistle. The long one does seem
|
||||
simple enough. It ought to mean, "Who is this who is coming?"
|
||||
|
||||
Well, the best way to find out is evidently to whistle
|
||||
for him.'
|
||||
|
||||
[Ghost Stories of an Antiquary, by Montague Rhodes James
|
||||
'Oh, Whistle, and I'll Come to You My Lad']
|
||||
# werecritter -- see "lycanthrope"
|
||||
*wight
|
||||
When he came to himself again, for a moment he could recall
|
||||
|
||||
@@ -139,26 +139,26 @@ GEOMETRY:center,center
|
||||
# This map has no visible outer boundary, and
|
||||
# is all "air".
|
||||
MAP
|
||||
AAAAAAAAAAAAAAAAAAAAAAAACCCCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
AAAAAAAAAAAAAAAAAAAAAAACCCCCCAAAAAAAACCCCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
AAAAAAAAAAAAAAAAAAAAACCAACCCCCAAAAAACCCCCCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
AAAAAAAAAAAAAAAAAAAAACCACCCCCCCAAAAACCCCCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
AAAAAAAAAAAAAAAAAAAAAACCCCCCCCCCAAAAACCCCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
AAAAAAAAAAAAAAAAAAAAAAAACCCCAAACCAAACCCCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
AAAAAAAAAAAAAAAAAAAAAAAAACCCCAAAAAACCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
AAAAAAAAAAAAAAAAAAAAAAACCCCCCCAAAACCACCCCCCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
AAAAAAAAAAAAAAAAAAAAAACCCCAAAAAAACCACAACCCCCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACCAACCCCCCCCCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAACCCCAAACCCCCCAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAACACACCCCCAAACCCCCCCAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
AAAAAAAAAAAAAAAAAAAAAAAAAAAAACAACCCCCCCAAAACCCCCCCAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAACACCCCCCCCAAACCCCCCCCAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACCCCCCCCCCAACCCCCCCCAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
AAAAAAAAAAAAAAAAAAAAAAAAAAAAACACCCCCCCCCCACCCCCCCCAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
AAAAAAAAAAAAAAAAAAAAAAAAAAAAACAACCCCCCCCCCCCCCCCAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAACCCCCCAAACCCCCAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
AAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAACCAAAAAACCCCAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACCCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
ENDMAP
|
||||
# Use up and down regions to partition the level into three parts;
|
||||
# teleportation can't cross from one part into another.
|
||||
|
||||
74
dat/history
74
dat/history
@@ -128,20 +128,20 @@ just before the release of NetHack 3.4.0 in March 2002.
|
||||
As with version 3.3, various people contributed to the game as a whole as
|
||||
well as supporting ports on the different platforms that NetHack runs on:
|
||||
|
||||
Pat Rankin maintained 3.5 for VMS.
|
||||
Pat Rankin maintained 3.4 for VMS.
|
||||
|
||||
Michael Allison maintained NetHack 3.5 for the MS-DOS platform.
|
||||
Michael Allison maintained NetHack 3.4 for the MS-DOS platform.
|
||||
Paul Winner and Yitzhak Sapir provided encouragement.
|
||||
|
||||
Dean Luick, Mark Modrall, and Kevin Hugo maintained and enhanced the
|
||||
Macintosh port of 3.4.
|
||||
|
||||
Michael Allison, David Cohrs, Alex Kompel, Dion Nicolaas, and Yitzhak Sapir
|
||||
maintained and enhanced 3.5 for the Microsoft Windows platform. Alex Kompel
|
||||
maintained and enhanced 3.4 for the Microsoft Windows platform. Alex Kompel
|
||||
contributed a new graphical interface for the Windows port. Alex Kompel also
|
||||
contributed a Windows CE port for 3.4.1.
|
||||
|
||||
Ron Van Iwaarden maintained 3.5 for OS/2.
|
||||
Ron Van Iwaarden maintained 3.4 for OS/2.
|
||||
|
||||
Janne Salmijarvi and Teemu Suikki maintained and enhanced the
|
||||
Amiga port of 3.5 after Janne Salmijarvi resurrected it for 3.3.1.
|
||||
@@ -174,7 +174,6 @@ At the beginning of development for what would eventually get released
|
||||
as 3.6.0, the development team consisted of Michael Allison,
|
||||
Warwick Allison, Ken Arromdee, David Cohrs, Jessie Collet, Ken Lorber,
|
||||
Dean Luick, Pat Rankin, Mike Stephenson, Janet Walz, and Paul Winner.
|
||||
|
||||
Leading up to the release of 3.6.0 in early 2015, new members Sean Hunt,
|
||||
Pasi Kallinen, and Derek S. Ray joined the NetHack development team.
|
||||
|
||||
@@ -211,7 +210,9 @@ people primarily responsible for the public NetHack servers available for
|
||||
playing the game at nethack.alt.org and devnull.net. In addition to providing
|
||||
a way for the public to play a game of NetHack from almost anywhere, they
|
||||
have hosted annual NetHack tournaments for many, many years.
|
||||
<FIXME> write up something for Robin, M. Drew Streib, Pasi Kallinen
|
||||
|
||||
On behalf of the NetHack community, thank you very much to
|
||||
M. Drew Streib, Pasi Kallinen and Robin Bandy.
|
||||
|
||||
- - - - - - - - - -
|
||||
|
||||
@@ -220,11 +221,11 @@ particularly intriguing modification to help out with the game. The Gods of
|
||||
the Dungeon sometimes make note of the names of the worst of these miscreants
|
||||
in this, the list of Dungeoneers:
|
||||
|
||||
Adam Aronow Izchak Miller Mike Stephenson
|
||||
Alex Kompel J. Ali Harlow Norm Meluch
|
||||
Andreas Dorn Janet Walz Olaf Seibert
|
||||
Andy Church Janne Salmijarvi Pasi Kallinen
|
||||
Andy Swanson Jean-Christophe Collet Pat Rankin
|
||||
Adam Aronow J. Ali Harlow Mike Stephenson
|
||||
Alex Kompel Janet Walz Norm Meluch
|
||||
Andreas Dorn Janne Salmijarvi Olaf Seibert
|
||||
Andy Church Jean-Christophe Collet Pasi Kallinen
|
||||
Andy Swanson Jeff Bailey Pat Rankin
|
||||
Ari Huttunen Jochen Erwied Paul Winner
|
||||
Barton House John Kallen Pierre Martineau
|
||||
Benson I. Margulies John Rupley Ralf Brown
|
||||
@@ -233,29 +234,30 @@ in this, the list of Dungeoneers:
|
||||
Bruce Cox Jon W{tte Richard Beigel
|
||||
Bruce Holloway Jonathan Handler Richard P. Hughey
|
||||
Bruce Mewborne Joshua Delahunty Rob Menke
|
||||
Carl Schelin Keizo Yamamoto Robin Johnson
|
||||
Chris Russo Ken Arnold Roderick Schertler
|
||||
David Cohrs Ken Arromdee Roland McGrath
|
||||
David Damerell Ken Lorber Ron Van Iwaarden
|
||||
David Gentzel Ken Washikita Ronnen Miller
|
||||
David Hairston Kevin Darcy Ross Brown
|
||||
Dean Luick Kevin Hugo Sascha Wostmann
|
||||
Del Lamb Kevin Sitze Scott Bigham
|
||||
Derek S. Ray Kevin Smolkowski Scott R. Turner
|
||||
Deron Meranda Kevin Sweet Sean Hunt
|
||||
Dion Nicolaas Lars Huttar Stephen Spackman
|
||||
Dylan O'Donnell Leon Arnott Stephen White
|
||||
Eric Backus Malcolm Ryan Steve Creps
|
||||
Eric Hendrickson Mark Gooderum Steve Linhart
|
||||
Eric R. Smith Mark Modrall Steve VanDevender
|
||||
Eric S. Raymond Marvin Bressler Teemu Suikki
|
||||
Erik Andersen Matthew Day Tim Lennan
|
||||
Frederick Roeber Merlyn LeRoy Timo Hakulinen
|
||||
Gil Neiger Michael Allison Tom Almy
|
||||
Greg Laskin Michael Feir Tom West
|
||||
Greg Olson Michael Hamel Warren Cheung
|
||||
Gregg Wonderly Michael Sokolov Warwick Allison
|
||||
Hao-yang Wang Mike Engber Yitzhak Sapir
|
||||
Helge Hafting Mike Gallop
|
||||
Irina Rempt-Drijfhout Mike Passaretti
|
||||
Carl Schelin Keizo Yamamoto Robin Bandy
|
||||
Chris Russo Ken Arnold Robin Johnson
|
||||
David Cohrs Ken Arromdee Roderick Schertler
|
||||
David Damerell Ken Lorber Roland McGrath
|
||||
David Gentzel Ken Washikita Ron Van Iwaarden
|
||||
David Hairston Kevin Darcy Ronnen Miller
|
||||
Dean Luick Kevin Hugo Ross Brown
|
||||
Del Lamb Kevin Sitze Sascha Wostmann
|
||||
Derek S. Ray Kevin Smolkowski Scott Bigham
|
||||
Deron Meranda Kevin Sweet Scott R. Turner
|
||||
Dion Nicolaas Lars Huttar Sean Hunt
|
||||
Dylan O'Donnell Leon Arnott Stephen Spackman
|
||||
Eric Backus M. Drew Streib Stephen White
|
||||
Eric Hendrickson Malcolm Ryan Steve Creps
|
||||
Eric R. Smith Mark Gooderum Steve Linhart
|
||||
Eric S. Raymond Mark Modrall Steve VanDevender
|
||||
Erik Andersen Marvin Bressler Teemu Suikki
|
||||
Frederick Roeber Matthew Day Tim Lennan
|
||||
Gil Neiger Merlyn LeRoy Timo Hakulinen
|
||||
Greg Laskin Michael Allison Tom Almy
|
||||
Greg Olson Michael Feir Tom West
|
||||
Gregg Wonderly Michael Hamel Warren Cheung
|
||||
Hao-yang Wang Michael Sokolov Warwick Allison
|
||||
Helge Hafting Mike Engber Yitzhak Sapir
|
||||
Irina Rempt-Drijfhout Mike Gallop
|
||||
Izchak Miller Mike Passaretti
|
||||
|
||||
|
||||
@@ -45,6 +45,7 @@ tombstone print tombstone when you die [TRUE]
|
||||
toptenwin print topten in a window rather than stdout [FALSE]
|
||||
travel enable the command to travel to a map location via [TRUE]
|
||||
a shortest-path algorithm, usually invoked by '_'.
|
||||
use_darkgray use bold black instead of blue for black glyphs. [TRUE]
|
||||
use_inverse display detected monsters in highlighted manner [FALSE]
|
||||
verbose print more commentary during the game [TRUE]
|
||||
|
||||
|
||||
Reference in New Issue
Block a user