Merge remote-tracking branch 'origin/NetHack-3.6.0'
This commit is contained in:
keni
@@ -2927,14 +2927,32 @@ The
|
||||
option is also used with
|
||||
the `/m', `/M', `/o', and `/O' sub-commands of `/',
|
||||
where the `none' setting is overridden with `map'.
|
||||
.lp whatis_inview
|
||||
.lp whatis_filter
|
||||
When getting a location on the map, and using the keys to cycle through
|
||||
next and previous targets, limit the possible targets to those in view.
|
||||
(default off)
|
||||
next and previous targets, allows filtering the possible targets.
|
||||
.lp ""
|
||||
.sd
|
||||
.si
|
||||
.CC n "no filtering [default]"
|
||||
.CC v "in view only"
|
||||
.CC a "in same area only"
|
||||
.ei
|
||||
.ed
|
||||
.lp ""
|
||||
The area-filter tries to be slightly predictive - if you're standing on a doorway,
|
||||
it will consider the area on the side of the door you were last moving towards.
|
||||
.lp ""
|
||||
Filtering can also be changed when getting a location with the ``getpos.filter''
|
||||
key.
|
||||
.lp whatis_menu
|
||||
When getting a location on the map, and using a key to cycle through
|
||||
next and previous targets, use a menu instead to pick a target.
|
||||
(default off)
|
||||
.lp whatis_moveskip
|
||||
When getting a location on the map, and using shifted movement keys or
|
||||
meta-digit keys to fast-move, instead of moving 8 units at a time,
|
||||
move by skipping the same glyphs.
|
||||
(default off)
|
||||
.lp windowtype
|
||||
Select which windowing system to use, such as ``tty'' or ``X11''
|
||||
(default depends on version).
|
||||
@@ -3246,8 +3264,12 @@ When asked for a location, the key to go to next closest object. Default is 'o'.
|
||||
When asked for a location, the key to go to previous closest object. Default is 'O'.
|
||||
.lp getpos.menu
|
||||
When asked for a location, and using one of the next or previous keys to cycle through targets, toggle showing a menu instead. Default is '!'.
|
||||
.lp getpos.inview
|
||||
When asked for a location, and using one of the next or previous keys to cycle through targets, toggle limiting possible targets to those in view only. Default is '"'.
|
||||
.lp getpos.moveskip
|
||||
When asked for a location, and using the shifted movement keys or meta-digit keys to fast-move around, move by skipping the same glyphs instead of by 8 units. Default is '*'.
|
||||
.lp getpos.filter
|
||||
When asked for a location, change the filtering mode when using one of the next
|
||||
or previous keys to cycle through targets. Toggles between no filtering, in view
|
||||
only, and in the same area only. Default is '"'.
|
||||
.lp getpos.pick
|
||||
When asked for a location, the key to choose the location, and possibly ask for more info. Default is '.'.
|
||||
.lp getpos.pick.once
|
||||
@@ -3264,6 +3286,10 @@ When asked for a location, the key to go to next closest unexplored location. De
|
||||
When asked for a location, the key to go to previous closest unexplored location. Default is 'X'.
|
||||
.lp getpos.valid
|
||||
When asked for a location, the key to go to show valid target locations. Default is '$'.
|
||||
.lp getpos.valid.next
|
||||
When asked for a location, the key to go to next closest valid location. Default is 'z'.
|
||||
.lp getpos.valid.prev
|
||||
When asked for a location, the key to go to previous closest valid location. Default is 'Z'.
|
||||
.lp nopickup
|
||||
Prefix key to move without picking up items. Default is 'm'.
|
||||
.lp redraw
|
||||
@@ -3724,6 +3750,12 @@ was interrupted.
|
||||
.lp whatis_coord:compass
|
||||
When targeting with cursor, describe the cursor position with coordinates
|
||||
relative to your character.
|
||||
.lp whatis_filter:area
|
||||
When targeting with cursor, filter possible locations so only those in
|
||||
the same area (eg. same room, or same corridor) are considered.
|
||||
.lp whatis_moveskip
|
||||
When targeting with cursor and using fast-move, skip the same glyphs instead
|
||||
of moving 8 units at a time.
|
||||
.lp nostatus_updates
|
||||
Prevent updates to the status lines at the bottom of the screen, if
|
||||
your screen-reader reads those lines. The same information can be
|
||||
|
||||
@@ -3561,15 +3561,38 @@ the `{\tt /m}', `{\tt /M}', `{\tt /o}', and `{\tt /O}' sub-commands
|
||||
of `{\tt /}',
|
||||
where the `{\it none\/}' setting is overridden with `{\it map}'.
|
||||
%.lp
|
||||
\item[\ib{whatis\verb+_+inview}]
|
||||
\item[\ib{whatis\verb+_+filter}]
|
||||
When getting a location on the map, and using the keys to cycle through
|
||||
next and previous targets, limit the possible targets to those in view.
|
||||
(default off)
|
||||
next and previous targets, allows filtering the possible targets.
|
||||
(default none)
|
||||
%.lp ""
|
||||
The possible settings are:
|
||||
|
||||
%.sd
|
||||
%.si
|
||||
{\tt n} --- \verb#no filtering#;\\
|
||||
{\tt v} --- \verb#in view only#;\\
|
||||
{\tt a} --- \verb#in same area (room, corridor, etc)#.
|
||||
%.ei
|
||||
%.ed
|
||||
%.lp ""
|
||||
The area-filter tries to be slightly predictive - if you're standing on a doorway,
|
||||
it will consider the area on the side of the door you were last moving towards.
|
||||
%.lp ""
|
||||
Filtering can also be changed when getting a location with the ``getpos.filter''
|
||||
key.
|
||||
%.lp
|
||||
\item[\ib{whatis\verb+_+menu}]
|
||||
When getting a location on the map, and using a key to cycle through
|
||||
next and previous targets, use a menu instead to pick a target.
|
||||
(default off)
|
||||
%.lp
|
||||
\item[\ib{whatis\verb+_+moveskip}]
|
||||
When getting a location on the map, and using shifted movement keys or
|
||||
meta-digit keys to fast-move, instead of moving 8 units at a time,
|
||||
move by skipping the same glyphs.
|
||||
(default off)
|
||||
%.lp
|
||||
\item[\ib{windowtype}]
|
||||
Select which windowing system to use, such as ``{\tt tty}'' or ``{\tt X11}''
|
||||
(default depends on version).
|
||||
@@ -3974,8 +3997,11 @@ When asked for a location, the key to go to previous closest object. Default is
|
||||
\item{\bb{getpos.menu}}
|
||||
When asked for a location, and using one of the next or previous keys to cycle through targets, toggle showing a menu instead. Default is '{\tt !}'.
|
||||
%.lp
|
||||
\item{\bb{getpos.inview}}
|
||||
When asked for a location, and using one of the next or previous keys to cycle through targets, toggle limiting possible targets to those in view only. Default is '{\tt "}'.
|
||||
\item{\bb{getpos.moveskip}}
|
||||
When asked for a location, and using the shifted movement keys or meta-digit keys to fast-move around, move by skipping the same glyphs instead of by 8 units. Default is ``{\tt *}''.
|
||||
%.lp
|
||||
\item{\bb{getpos.filter}}
|
||||
When asked for a location, change the filtering mode when using one of the next or previous keys to cycle through targets. Toggles between no filtering, in view only, and in the same area only. Default is '{\tt "}'.
|
||||
%.lp
|
||||
\item{\bb{getpos.pick}}
|
||||
When asked for a location, the key to choose the location, and possibly ask for more info. Default is ``{\tt .}''.
|
||||
@@ -4001,6 +4027,12 @@ When asked for a location, the key to go to previous closest unexplored location
|
||||
\item{\bb{getpos.valid}}
|
||||
When asked for a location, the key to go to show valid target locations. Default is ``{\tt \$}''.
|
||||
%.lp
|
||||
\item{\bb{getpos.valid.next}}
|
||||
When asked for a location, the key to go to next closest valid location. Default is ``{\tt z}''.
|
||||
%.lp
|
||||
\item{\bb{getpos.valid.prev}}
|
||||
When asked for a location, the key to go to previous closest valid location. Default is ``{\tt Z}''.
|
||||
%.lp
|
||||
\item{\bb{nopickup}}
|
||||
Prefix key to move without picking up items. Default is ``{\tt m}''.
|
||||
%.lp
|
||||
@@ -4528,6 +4560,14 @@ was interrupted.
|
||||
When targeting with cursor, describe the cursor position with coordinates
|
||||
relative to your character.
|
||||
%.lp
|
||||
\item[\ib{whatis\verb+_+filter:area}]
|
||||
When targeting with cursor, filter possible locations so only those in
|
||||
the same area (eg. same room, or same corridor) are considered.
|
||||
%.lp
|
||||
\item[\ib{whatis\verb+_+moveskip}]
|
||||
When targeting with cursor and using fast-move, skip the same glyphs instead
|
||||
of moving 8 units at a time.
|
||||
%.lp
|
||||
\item[\ib{nostatus\verb+_+updates}]
|
||||
Prevent updates to the status lines at the bottom of the screen, if
|
||||
your screen-reader reads those lines. The same information can be
|
||||
|
||||
@@ -404,6 +404,11 @@ fix the 'A' command to have the 'D' command's fix for C331-1 (quirk for
|
||||
menustyle:Combination; if user included 'a' in "which object classes?"
|
||||
response, to operate on applicable all items, there would still be a
|
||||
followup menu asking to choose specific items)
|
||||
eating 1 tin from stack of N (for N >= 2) on shop's floor forced hero to buy 2
|
||||
using a cursed whistle in a vault will summon the guard immediately
|
||||
throne room's throne is occupied by a king
|
||||
using a grappling hook and getting pulled toward the target into water would
|
||||
drown hero without any chance to crawl out
|
||||
|
||||
|
||||
Fixes to Post-3.6.0 Problems that Were Exposed Via git Repository
|
||||
@@ -453,6 +458,9 @@ attempting to name an item as an artifact and failing via hand slip violates
|
||||
illiterate conduct
|
||||
crashes for 'A' above were downgraded to impossible "cursed without otmp"
|
||||
wizhelp: ^O is #overview in wizard mode too; #wizwhere shows dungeon layout
|
||||
wishing for tins sometimes yielded a tin wand
|
||||
replace the fix for preventing putting on a helm of opposite alignment from
|
||||
causing wielded Excalibur from blasting hero twice
|
||||
|
||||
|
||||
Platform- and/or Interface-Specific Fixes
|
||||
@@ -492,6 +500,9 @@ unix: Makefile.{src,utl} ignored CPPFLAGS which is expanded by the default .c
|
||||
win32gui: getversionstring() was overflowing the provided Help About buffer
|
||||
win32gui: guard against buffer overflow in in mswin_getlin()
|
||||
win32gui: handle menu_color attribute
|
||||
win32gui: name-from-discoveries list menu selector characters were punctuation
|
||||
instead of letters, repeated for each class; caused by the core bug
|
||||
of erroneously specifying space as a selector for class header lines
|
||||
MacOSX: initial binary release was built from out of date source code that
|
||||
had 'BETA' and 'DEBUG' inappropriately enabled
|
||||
MacOSX: force TIMED_DELAY build option on so that 'runmode' run-time option
|
||||
@@ -585,6 +596,10 @@ random horses have a tiny chance of being generated saddled
|
||||
give feedback just before timed levitation runs out
|
||||
travel accepts 'm' (request menu) prefix
|
||||
pressing a or A when cursor positioning shows menu of "interesting" features
|
||||
pressing z or Z when cursor positioning cycles through valid locations for
|
||||
jumping, hitting with polearm, or casting a stinking cloud
|
||||
when moving a cursor for a jump, polearm, or stinking cloud targeting, show
|
||||
if the location is illegal, if "autodescribe" is on
|
||||
wizard-mode command #wizmakemap to recreate the current level
|
||||
'goldX' boolean option to treat gold pieces as X (vs U) during BUCX filtering
|
||||
(should be persistent but is reset each save/restore cycle in order
|
||||
@@ -593,6 +608,8 @@ for menustyle:Traditional and Combination, support BUCX filtering for item
|
||||
pick-up and container put-in and take-out; also for object IDing
|
||||
for menustyle:Full and Traditional and Combination, support BUCX filtering
|
||||
for the 'A' command
|
||||
option whatis_filter to set filtering for eligible map locations when cursor
|
||||
positioning
|
||||
|
||||
|
||||
Platform- and/or Interface-Specific New Features
|
||||
|
||||
Reference in New Issue
Block a user