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

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

Browse Source
This commit is contained in:
keni
2017-12-04 17:34:59 -05:00
parent 51daa87e49 fdf07f932b
commit d7e7a7d0ee
38 changed files with 329 additions and 10840 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
doc/Guidebook.mn
View File

@@ -1,4 +1,4 @@
.\" $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.233 $ $NHDT-Date: 1505214878 2017/09/12 11:14:38 $
.\" $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.240 $ $NHDT-Date: 1512098127 2017/12/01 03:15:27 $
.ds h0 "NetHack Guidebook
.ds h1
.ds h2 %
@@ -924,8 +924,17 @@ This command allows you to move an item from one particular inventory
slot to another so that it has a letter which is more meaningful for you
or that it will appear in a particular location when inventory listings
are displayed.
You can move to a currently empty slot, or if the destination is
occupied--and won't merge--the item there will swap slots with the one
being moved.
``#adjust'' can also be used to split a stack of objects; when
choosing the item to adjust, enter a count prior to its letter.
.lp ""
When no count is given, other compatible stacks are merged with the source
stack as it's moved to the destination. When a split count is given, the
only stack that might be merged is the one already in the destination.
To move a whole stack without having other compatible ones merge with it,
specify a ``split'' count which matches the full stack size.
.lp #annotate
Allows you to specify one line of text to associate with the current
dungeon level. All levels with annotations are displayed by the
@@ -944,7 +953,7 @@ Show your attributes. Default key is '^X'.
.lp #autopickup
Toggle the autopickup -option on/off. Default key is '@'.
.lp #call
Call (name) a monster, or a object in inventory, on the floor,
Call (name) a monster, or an object in inventory, on the floor,
or in the discoveries list, or add an annotation for the
current level (same as ``#annotate''). Default key is 'C'.
.lp #cast
@@ -997,7 +1006,7 @@ Jump to another location. Autocompletes. Default key is 'M-j', and 'j' if number
.lp #kick
Kick something. Default key is '^D', and 'k' if number_pad is on.
.lp #known
Show what object types have been discovered. Default key is '\'.
Show what object types have been discovered. Default key is '\\'.
.lp #knownclass
Show discovered types for one class of objects. Default key is '`'.
.lp #levelchange

13
doc/Guidebook.tex
View File

@@ -1104,8 +1104,17 @@ This command allows you to move an item from one particular inventory
slot to another so that it has a letter which is more meaningful for you
or that it will appear in a particular location when inventory listings
are displayed.
You can move to a currently empty slot, or if the destination is
occupied--and won't merge--the item there will swap slots with the one
being moved.
``{\tt \#adjust}'' can also be used to split a stack of objects; when
choosing the item to adjust, enter a count prior to its letter.
choosing the item to adjust, enter a count prior to its letter.\\
%.lp ""
When no count is given, other compatible stacks are merged with the source
stack as it's moved to the destination. When a split count is given, the
only stack that might be merged is the one already in the destination.
To move a whole stack without having other compatible ones merge with it,
specify a ``split'' count which matches the full stack size.
%.lp
\item[\tb{\#annotate}]
Allows you to specify one line of text to associate with the current
@@ -1129,7 +1138,7 @@ Show your attributes. Default key is '{\tt \^{}X}'.\\
Toggle the {\it autopickup\/} -option. Default key is '{\tt @}'.\\
%.lp
\item[\tb{\#call}]
Call (name) a monster, or a object in inventory, on the floor,
Call (name) a monster, or an object in inventory, on the floor,
or in the discoveries list, or add an annotation for the
current level (same as ``{\tt \#annotate}''). Default key is '{\tt C}'.
%.lp

8
doc/fixes36.1
View File

@@ -473,6 +473,11 @@ make Vlad slightly tougher
reduce the amount of gold laying on the floor
locked chests and large boxes contain more stuff
make shopkeepers bill hero for burying merchandise
monster holding hero takes double damage from an explosion for reaching into
adjacent spot, but it was being inflicted even when hero was swallowed
or beyond the explosion radius
poly'd hero holding monster now takes double damage (if monster is within
explosion radious) instead of inflicting that upon the monster
Fixes to Post-3.6.0 Problems that Were Exposed Via git Repository
@@ -715,6 +720,9 @@ Master Key of Thievery always finds door and chest traps if used to lock or
"Elbereth" now erodes based on attacks by the player, not monsters scared
option herecmd_menu to make a mouse click on your character pop up
a context menu, and extended command #herecmdmenu to do the same
for #adjust, specifying a split count which matches an inventory slot's full
size will move or swap that stack without combining other compatible
stacks (except for the one in the destination slot, if applicable)
Platform- and/or Interface-Specific New Features