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

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

Browse Source
This commit is contained in:
nhmall
2018-09-20 18:45:08 -04:00
parent 5f551553db 49e4330cb2
commit 2ea332544b
68 changed files with 765 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
doc/Guidebook.mn
View File

@@ -54,7 +54,7 @@
.in -\\n(PYu \" undo indent past label (etc)
.sn \\n(pdu \" tmac.n: inter-paragraph space
..
.\" end of labeled paragrah
.\" end of labeled paragraph
.\"
.\" aligned single character key with SHORT definition (if it overflows one
.\" line, all bets are off)
@@ -1583,7 +1583,7 @@ debt or credit, if any. The `Iu' command lists unpaid items
The `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
Shop idiosyncracies
Shop idiosyncrasies
.pg
Several aspects of shop behavior might be unexpected.
.\" note: using * instead of \(bu is better for plain text output
@@ -2463,19 +2463,19 @@ defaults to the location of the NetHack.exe or NetHackw.exe file
so setting HACKDIR to override that is not usually necessary or recommended.
.lp LEVELDIR
The location that in-progress level files are stored. Defaults to HACKDIR,
must be writeable.
must be writable.
.lp SAVEDIR
The location where saved games are kept. Defaults to HACKDIR, must be
writeable.
writable.
.lp BONESDIR
The location that bones files are kept. Defaults to HACKDIR, must be
writeable.
writable.
.lp LOCKDIR
The location that file synchronization locks are stored. Defaults to
HACKDIR, must be writeable.
HACKDIR, must be writable.
.lp 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 AUTOCOMPLETE
Enable or disable an extended command autocompletion.
Autocompletion has no effect for the X11 windowport.
@@ -3004,7 +3004,6 @@ such as ``paranoid_confirmation:attack pray Remove''.
.lp perm_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 pettype
Specify the type of your initial pet, if you are playing a character class
that uses multiple types of pets; or choose to have no initial pet at all.
@@ -4018,7 +4017,7 @@ m S_mimic (mimic)
] S_mimic_def (mimic)
M S_mummy (mummy)
N S_naga (naga)
\. S_ndoor (doorway witout door)
\. S_ndoor (doorway without door)
n S_nymph (nymph)
O S_ogre (ogre)
o S_orc (orc)

15
doc/Guidebook.tex
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

14
doc/Guidebook.txt
View File

@@ -1926,7 +1926,7 @@
any unpaid items which have been used up, along with other shop
fees, if any.
5.4.1. Shop idiosyncracies
5.4.1. Shop idiosyncrasies
Several aspects of shop behavior might be unexpected.
@@ -3015,19 +3015,19 @@
LEVELDIR
The location that in-progress level files are stored. Defaults
to HACKDIR, must be writeable.
to HACKDIR, must be writable.
SAVEDIR
The location where saved games are kept. Defaults to HACKDIR,
must be writeable.
must be writable.
BONESDIR
The location that bones files are kept. Defaults to HACKDIR,
must be writeable.
must be writable.
LOCKDIR
The location that file synchronization locks are stored.
Defaults to HACKDIR, must be writeable.
Defaults to HACKDIR, must be writable.
NetHack 3.6 May 27, 2018
@@ -3042,7 +3042,7 @@
TROUBLEDIR
The location that a record of game aborts and self-diagnosed
game problems is kept. Defaults to HACKDIR, must be writeable.
game problems is kept. Defaults to HACKDIR, must be writable.
AUTOCOMPLETE
Enable or disable an extended command autocompletion. Autocom-
@@ -5043,7 +5043,7 @@
] S_mimic_def (mimic)
M S_mummy (mummy)
N S_naga (naga)
. S_ndoor (doorway witout door)
. S_ndoor (doorway without door)
n S_nymph (nymph)
O S_ogre (ogre)
o S_orc (orc)

10
doc/config.nh
View File

@@ -398,21 +398,21 @@
#HACKDIR=c:\games\nethack
# The location that level files in progress are stored
# (default=HACKDIR, writeable)
# (default=HACKDIR, writable)
#LEVELDIR=c:\nethack\levels
# The location where saved games are kept (default=HACKDIR, writeable)
# The location where saved games are kept (default=HACKDIR, writable)
#SAVEDIR=c:\nethack\save
# The location that bones files are kept (default=HACKDIR, writeable)
# The location that bones files are kept (default=HACKDIR, writable)
#BONESDIR=c:\nethack\save
# The location that file synchronization locks are stored
# (default=HACKDIR, writeable)
# (default=HACKDIR, writable)
#LOCKDIR=c:\nethack\levels
# The location that a record of game aborts and self-diagnosed game problems
# is kept (default=HACKDIR, writeable)
# is kept (default=HACKDIR, writable)
#TROUBLEDIR=c:\nethack\trouble
# Finnish keyboards might need these modifications uncommented. Windows GUI.

14
doc/fixes36.2
View File

@@ -117,6 +117,17 @@ for hilite_status of string status fields (title, dungeon-level, alignment),
jumping into or over a Sokoban pit, or over a fire trap, triggers trap twice
mimics created by #wizgenesis could block or not block vision incorrectly
handle monsters inside the invocation area
give monsters who have had a worn item stolen or who have been life-saved
(used up amulet) a chance to wear replacement gear on next move
instead of having to wait until they pick something up
Unchanging hero in clay golem form will be killed when cancelled
poly'd shapechanger and hiding mimic will revert to normal when cancelled,
like werecreature in beast form and non-Unchanging hero
cancelled shapeshifter is no longer able to change shape
cancelled shapeshifter hit by polymorph magic will become uncancelled
polymorph zap which creates a new long worm (or retains an old one via wizard
mode monpolycontrol) can hit that worm multiple times (tail segments)
wishing for "orange" could yield orange or orange colored gem/potion/spellbook
Fixes to Post-3.6.1 Problems that Were Exposed Via git Repository
@@ -133,6 +144,8 @@ tty: ensure that current status fields are always copied to prior status
Platform- and/or Interface-Specific Fixes
-----------------------------------------
move 'perm_invent' value from flags to iflags to keep it out of save files;
affects X11, win32, and curses
windows-gui: In nethackw, there could be conflicts between menu accelerators
and an extra choice accelerator to fix H7132.
windows-gui: recognize new BL_RESET in status_update; no change in behavior yet
@@ -185,6 +198,7 @@ wizard mode #wizidentify can now select individual items for permanent
identification and don't display the selection to permanently
identify everything if everything is already fully identified
spiders will occasionally spin webs when moving around
make mine town "orctown" variation a multiple level feature of the mines
Code Cleanup and Reorganization

2
doc/nethack.6
View File

@@ -93,7 +93,7 @@ To win the game (as opposed to merely playing to beat other people's high
scores) you must locate the Amulet of Yendor which is somewhere below
the 20th level of the dungeon and get it out.
Few people achieve this; most never do. Those who have go down
in history as heros among heroes - and then they find ways of making the
in history as heroes among heroes - and then they find ways of making the
game even harder. See the
.I Guidebook
section on Conduct if this game has gotten too easy for you.

2
doc/nethack.txt
View File

@@ -26,7 +26,7 @@ DESCRIPTION
To win the game (as opposed to merely playing to beat other people's
high scores) you must locate the Amulet of Yendor which is somewhere
below the 20th level of the dungeon and get it out. Few people achieve
this; most never do. Those who have go down in history as heros among
this; most never do. Those who have go down in history as heroes among
heroes - and then they find ways of making the game even harder. See
the Guidebook section on Conduct if this game has gotten too easy for
you.

12
doc/window.doc
View File

@@ -177,7 +177,7 @@ int nhgetch() -- Returns a single character input from the user.
changed and also return ASCII 033 in this case.
int nh_poskey(int *x, int *y, int *mod)
-- Returns a single character input from the user or a
a positioning event (perhaps from a mouse). If the
positioning event (perhaps from a mouse). If the
return value is non-zero, a character was typed, else,
a position in the MAP window is returned in x, y and mod.
mod may be one of
@@ -334,7 +334,7 @@ add_menu(windid window, int glyph, const anything identifier,
outside of the standard accelerator (see above) or a
number. If 0, the item is unaffected by any group
accelerator. If this accelerator conflicts with
the menu command (or their user defined alises), it loses.
the menu command (or their user defined aliases), it loses.
The menu commands and aliases take care not to interfere
with the default object class symbols.
-- If you want this choice to be preselected when the
@@ -461,7 +461,7 @@ status_update(int fldindex, genericptr_t ptr, int chg, int percentage, int color
For the user's chosen set of BL_MASK_ condition bits,
They are stored internally in the cond_hilites[] array,
at the array offset aligned to the color those condtion
at the array offset aligned to the color those condition
bits should display in.
For example, if the user has chosen to display strngl
@@ -602,7 +602,7 @@ getmsghistory(init)
If init is TRUE, start over again from most recent message.
putmsghistory(msg)
-- The is the counterpart to getmsghistory() for restores
-- This is the counterpart to getmsghistory() for restores
used to reload the port's message recall buffer.
The routine is called repeatedly from the core restore
routine, starting with the oldest message first, and
@@ -693,7 +693,7 @@ when processing options, either in the config file, or by the 'O' command.
You may be wondering what values your window port will find in the
iflags.wc_* and iflags.wc2_* fields for options that the user has not
specified in his/her config file. Put another way, how does you port code
specified in his/her config file. Put another way, how does your port code
tell if an option has not been set? The next paragraph explains that.
If the core does not set an option, it will still be initialized
@@ -1068,7 +1068,7 @@ When writing a new window-port, you need to follow the following guidelines:
WINOBJ (if you want the NetHack binary to include them, that is).
9) Look at your port's portmain.c (the file containing main()) and make
sure that all of the calls match the the requirements laid out in
sure that all of the calls match the requirements laid out in
Section VII.
Now, proceed with compilation and installation as usual. Don't forget