From: PatR Date: Mon, 14 Dec 2020 09:00:19 +0000 (-0800) Subject: have run #terrain X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=788e21ac43f2f8faf0c1a859391fd0790be8a463;p=nethack have run #terrain Having recently noticed that using aka aka could work as a command, assign it to #terrain. #terrain was the only command in the "game" subset of commands as shown by '? i' that didn't have any key assignment. Since might be swapped with on some terminals and is a keypad key on the typical PC keyboard, it might not work reliably depending on nethack's number_pad mode or the hardware Num-Lock setting. Players in either of those situations haven't lost anything; they can still use extended command #terrain. --- diff --git a/dat/cmdhelp b/dat/cmdhelp index cd0944d2d..d993c313c 100644 --- a/dat/cmdhelp +++ b/dat/cmdhelp @@ -1,4 +1,4 @@ -&# cmdhelp +&# cmdhelp - became obsolete when 'BINDINGS=key:command' got added & Tell what command a keystroke invokes ^ Show the type of an adjacent trap ^[ Cancel command (same as ESCape key) @@ -145,6 +145,7 @@ _ Travel via a shortest-path algorithm to a point on the map * Show all equipment in use (combination of the ),[,=,",( commands) $ Count your gold + List known spells +Del Display map without monsters or objects obstructing the view. # Perform an extended command (use '#?' to list choices) &# number_pad: &# -1 = numpad off, swap y with z (including Y with Z, ^Y with ^Z, M-y &c) diff --git a/doc/Guidebook.mn b/doc/Guidebook.mn index 524cd88c9..dff313965 100644 --- a/doc/Guidebook.mn +++ b/doc/Guidebook.mn @@ -1,4 +1,4 @@ -.\" $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.405 $ $NHDT-Date: 1607693152 2020/12/11 13:25:52 $ +.\" $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.407 $ $NHDT-Date: 1607936398 2020/12/14 08:59:58 $ .\" .\" This is an excerpt from the 'roff' man page from the 'groff' package. .\" Guidebook.mn currently does *not* fully adhere to these guidelines. @@ -35,7 +35,7 @@ .ds vr "NetHack 3.7 .ds f0 "\*(vr .ds f1 -.ds f2 "December 11, 2020 +.ds f2 "December 13, 2020 . .\" A note on some special characters: .\" \(lq = left double quote @@ -1060,6 +1060,20 @@ Show discovered types for one class of objects. .lp ! Escape to a shell. See \(lq#shell\(rq below for more details. +.lp Del +Show map without obstructions. +You can view the explored portion of the current level's map without +monsters; without monsters and objects; or without monsters, objects, +and traps. +.lp "" +The key is also shown as on some keyboards or +on others. +It is sometimes displayed as \(ha? even though that is not an actual +control character. +.lp "" +Many terminals have an option to swap the and keys, +so typing the key might not execute this command. +If that happens, you can use the extended command \(lq#terrain\(rq instead. .lp # Perform an extended command. .lp "" @@ -1447,8 +1461,17 @@ Default key is \(oqA\(cq. Teleport around the level. Default key is \(oq\(haT\(cq. .lp "#terrain " -Show bare map without displaying monsters, objects, or traps. +Show map without obstructions. +In normal play you can view the explored portion of the current level's +map without monsters; without monsters and objects; or without monsters, +objects, and traps. +.lp "" +In explore mode, you can choose to view the full map rather than just +its explored portion. +In debug mode there are additional choices. +.lp "" Autocompletes. +Default key is \(oq\(cq or \(oq\(cq (see \fIDel\fP above). .lp #therecmdmenu Show a menu of possible actions in a location next to you. .lp "#throw " diff --git a/doc/Guidebook.tex b/doc/Guidebook.tex index bbef61f06..c5b89b555 100644 --- a/doc/Guidebook.tex +++ b/doc/Guidebook.tex @@ -45,7 +45,7 @@ %.au \author{Original version - Eric S. Raymond\\ (Edited and expanded for 3.7 by Mike Stephenson and others)} -\date{December 11, 2020} +\date{December 13, 2020} \maketitle @@ -1162,6 +1162,21 @@ Show discovered types for one class of objects. Escape to a shell. See ``\#shell'' below for more details. %.lp +\item[\tb{Del}] +Show map without obstructions. +You can view the explored portion of the current level's map without +monsters; without monsters and objects; or without monsters, objects, +and traps.\\ +%.lp "" +The key is also shown as on some keyboards or +on others. +It is sometimes displayed as \^{}? even though that is not an actual +control character.\\ +%.lp "" +Many terminals have an option to swap the and keys, +so typing the key might not execute this command. +If that happens, you can use the extended command ``\#terrain'' instead. +%.lp \item[\tb{\#}] Perform an extended command.\\ %.lp "" @@ -1537,8 +1552,17 @@ Remove all armor. Default key is `{\tt A}'. Teleport around the level. Default key is `{\tt \^{}T}'. %.lp \item[\tb{\#terrain}] -Show bare map without displaying monsters, objects, or traps. +Show map without obstructions. +In normal play you can view the explored portion of the current level's +map without monsters; without monsters and objects; or without monsters, +objects, and traps.\\ +%.lp "" +In explore mode, you can choose to view the full map rather than just +its explored portion. +In debug mode there are additional choices.\\ +%.lp "" Autocompletes. +Default key is `' or `' (see {\it Del\/} above). %.lp \item[\tb{\#therecmdmenu}] Show a menu of possible actions in a location next to you. diff --git a/doc/fixes37.0 b/doc/fixes37.0 index 5dc248646..cfcd3f76c 100644 --- a/doc/fixes37.0 +++ b/doc/fixes37.0 @@ -1,4 +1,4 @@ -NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.391 $ $NHDT-Date: 1607901923 2020/12/13 23:25:23 $ +NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.392 $ $NHDT-Date: 1607936398 2020/12/14 08:59:58 $ General Fixes and Modified Features ----------------------------------- @@ -670,6 +670,7 @@ let tourists read conical hats when "?i" (show key bindings) displays commands and their keys, also show commands without any key (so useable via '#', or possibly menu, only; the majority are debugging commands) +assign default key binding for or to execute #terrain Platform- and/or Interface-Specific New Features diff --git a/src/cmd.c b/src/cmd.c index bdc9d0c9f..581460e4f 100644 --- a/src/cmd.c +++ b/src/cmd.c @@ -1,4 +1,4 @@ -/* NetHack 3.7 cmd.c $NHDT-Date: 1607641581 2020/12/10 23:06:21 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.432 $ */ +/* NetHack 3.7 cmd.c $NHDT-Date: 1607936399 2020/12/14 08:59:59 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.433 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Robert Patrick Rankin, 2013. */ /* NetHack may be freely redistributed. See license for details. */ @@ -1913,7 +1913,11 @@ struct ext_func_tab extcmdlist[] = { { 'T', "takeoff", "take off one piece of armor", dotakeoff }, { 'A', "takeoffall", "remove all armor", doddoremarm }, { C('t'), "teleport", "teleport around the level", dotelecmd, IFBURIED }, - { '\0', "terrain", "show map without obstructions", + /* \177 == aka aka ; some terminals have an + option to swap it with so if there's a key labeled + it may or may not actually invoke the #terrain command */ + { '\177', "terrain", + "view map without monsters or objects obstructing it", doterrain, IFBURIED | AUTOCOMPLETE }, { '\0', "therecmdmenu", "menu of commands you can do from here to adjacent spot",