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

more #adjust (#H6571)

Browse Source 
Make the suggested change that only adjusting something into its own
slot be the way to collect/merge compatible stacks with it, instead
of any #adjust without a split count.  This removes the previous
special case for a count that matches the stack size.  Having to
know the exact count was not a burden on the player, but being able
to move things around without merging with other stacks makes more
sense than the original behavior or the hack to work-around that
behavior.
This commit is contained in:
PatR
2017-12-05 03:38:23 -08:00
parent fdf07f932b
commit d7f26afba8
4 changed files with 102 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
doc/Guidebook.mn
View File

@@ -1,4 +1,4 @@
.\" $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.240 $ $NHDT-Date: 1512098127 2017/12/01 03:15:27 $
.\" $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.241 $ $NHDT-Date: 1512473628 2017/12/05 11:33:48 $
.ds h0 "NetHack Guidebook
.ds h1
.ds h2 %
@@ -930,11 +930,19 @@ 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.
Adjusting without a count used to collect all compatible stacks when
moving to the destination. That behavior has been changed; to gather
compatible stacks, ``#adjust'' a stack into its own inventory slot.
If it has a name assigned, other stacks with the same name or with
no name will merge provided that all their other attributes match.
If it does not have a name, only other stacks with no name are eligible.
In either case, otherwise compatible stacks with a different name
will not be merged. This contrasts with using ``#adjust'' to move
from one slot to a different slot. In that situation, moving (no
count given) a compatible stack will merge if either stack has a
name when the other doesn't and give that name to the result, while
splitting (count given) will ignore the source stack's name when
deciding whether to merge with the destination stack.
.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

18
doc/Guidebook.tex
View File

@@ -1110,11 +1110,19 @@ 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.\\
%.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.
Adjusting without a count used to collect all compatible stacks when
moving to the destination. That behavior has been changed; to gather
compatible stacks, ``{\tt \#adjust}'' a stack into its own inventory slot.
If it has a name assigned, other stacks with the same name or with
no name will merge provided that all their other attributes match.
If it does not have a name, only other stacks with no name are eligible.
In either case, otherwise compatible stacks with a different name
will not be merged. This contrasts with using ``{\tt \#adjust}'' to move
from one slot to a different slot. In that situation, moving (no
count given) a compatible stack will merge if either stack has a
name when the other doesn't and give that name to the result, while
splitting (count given) will ignore the source stack's name when
deciding whether to merge with the destination stack.
%.lp
\item[\tb{\#annotate}]
Allows you to specify one line of text to associate with the current

6
doc/fixes36.1
View File

@@ -720,9 +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)
change #adjust's behavior when collecting compatible stacks; that used to
occur for any #adjust which lacked a split count, now it only happens
when 'adjusting' into a stack's own inventory slot
Platform- and/or Interface-Specific New Features