C/#name menu, calling old discoveries [2 of 2] (trunk only)

Implement <Someone>'s menu-mode for #name, primarily because it is the natural place to add [re]naming entries in the discoveries list, something that was requested in the newsgroup ten or so years ago. The latter allows changing the type name of something which has previously been named and is no longer being carried. This also makes the C command become a synonym for #name or vice versa; one or the other could now be reassigned to something else.
2007-05-25 02:02:44 +00:00
parent 97928335ae
commit 86a1e8b1b1
6 changed files with 35 additions and 25 deletions
--- a/dat/cmdhelp
+++ b/dat/cmdhelp
@@ -21,7 +21,7 @@ b       Go southwest 1 space
 B       Go southwest until you are on top of something
 ^B      Go southwest until you are near something
 c       Close a door
-C       Call (name) a particular monster
+C       Call (name) a monster, an individual object, or a type of object
 d       Drop an item
 D       Drop specific item types
 e       Eat something
@@ -47,7 +47,7 @@ L       Go east until you are on top of something
 m       Followed by direction, move without picking anything up or fighting
 M       Followed by direction, move a distance without picking anything up
 n       Go southeast 1 space
-N       Go southeast until you are on something (if number_pad, name an object)
+N       Go southeast until you are on something (if number_pad is on, name)
 ^N      Go southeast until you are near something
 o       Open a door
 O       Show option settings, possibly change them
@@ -109,7 +109,7 @@ M-i     Invoke an object's special powers
 M-j     Jump to another location
 M-l     Loot a box on the floor
 M-m     Use a monster's special ability
-M-n     Name an item or type of object
+M-n     Name a monster, an individual object, or a type of object
 M-o     Offer a sacrifice to the gods
 M-p     Pray to the gods for help
 M-q     Quit
--- a/dat/help
+++ b/dat/help
@@ -83,12 +83,12 @@ Commands:
        <       Go up a staircase (if you are standing on it).
        >       Go down a staircase (if you are standing on it).
        .       Rest, do nothing for one turn.
-        _       Travel via a shortest-path algorithm to a point on the map 
-        a       Apply (use) a tool (pick-axe, key, lamp...)
+        _       Travel via a shortest-path algorithm to a point on the map.
+        a       Apply (use) a tool (pick-axe, key, lamp...).
        A       Remove all armor.
-        ^A      Redo the previous command
+        ^A      Redo the previous command.
        c       Close a door.
-        C       Call (name) an individual monster.
+        C       Call (name) monster, individual object, or type of object.
        d       Drop something.  d7a:  drop seven items of object a.
        D       Drop multiple items.  This command is implemented in two
                different ways.  One way is:
@@ -184,8 +184,8 @@ Commands:
        j       Jump to another location.
        k       Kick (for doors, usually).
        l       Loot a box on the floor.
-        n       followed by number of times to repeat the next command
-        N       Name an object or type of object.
+        n       followed by number of times to repeat the next command.
+        N       Name a monster, an individual object, or a type of object.
        u       Untrap a trapped object or door.

        You can put a number before a command to repeat it that many times,
--- a/dat/hh
+++ b/dat/hh
@@ -45,7 +45,7 @@ Game commands:
 a       apply   apply or use a tool (pick-axe, key, camera, etc.)
 A       armor   take off all armor
 c       close   close a door
-C       call    name an individual monster (ex. baptize your dog)
+C       call    name a monster, an individual object, or a type of object
 d       drop    drop an object.  d7a:  drop seven items of object 'a'
 D       Drop    drop selected types of objects
 e       eat     eat something
@@ -100,7 +100,7 @@ M-i     invoke  invoke an object's special powers
 M-j     jump    jump to another location
 M-l     loot    loot a box on the floor
 M-m     monster use a monster's special ability
-M-n     name    name an item or type of object
+M-n     name    name a monster, an individual object, or a type of object
 M-o     offer   offer a sacrifice to the gods
 M-p     pray    pray to the gods for help
 M-q     quit    stop playing
--- a/doc/Guidebook.mn
+++ b/doc/Guidebook.mn
@@ -5,7 +5,7 @@
 .ds vr "NetHack 3.5
 .ds f0 "\*(vr
 .ds f1
-.ds f2 "September 20, 2006
+.ds f2 "May 24, 2007
 .mt
 A Guide to the Mazes of Menace
 (Guidebook for NetHack)
@@ -497,7 +497,8 @@ Redo the previous command.
 .lp c
 Close a door.
 .lp C
-Call (name) an individual monster.
+Call (name) a monster, an individual object, or a type of object.
+Same as extended command ``#name''.
 .lp ^C
 Panic button.  Quit the game.
 .lp d
@@ -707,7 +708,7 @@ from a horse standing next to you.
 .lp #monster
 Use a monster's special ability (when polymorphed into monster form).
 .lp #name
-Name an item or type of object.
+Name a monster, an individual object, or a type of object.  Same as `C'.
 .lp #offer
 Offer a sacrifice to the gods.
 .lp #pray
@@ -802,7 +803,9 @@ Kick something (usually a door).  Same as `^D'.
 Loot a box or bag on the floor beneath you, or the saddle 
 from a horse standing next to you.  Same as ``#loot'' or ``M-l''.
 .lp N
-Name an item or type of object.  Same as ``#name'' or ``M-n''.
+Name a monster, an individual object, or a type of object.  Same
+as ``#name'' (or ``M-n'') which is the same as the `C'
+command.
 .lp u
 Untrap a trap, door, or chest.  Same as ``#untrap'' or ``M-u''.

@@ -949,7 +952,8 @@ help you locate them before they locate you (which some monsters can do
 very well).
 .pg
 The commands `/' and `;' may be used to obtain information about those
-monsters who are displayed on the screen.  The command `C' allows you
+monsters who are displayed on the screen.  The command ``#name'', or
+its synonym `C', allows you
 to assign a name to a monster, which may be useful to help distinguish
 one from another when multiple monsters are present.  Assigning a name
 which is just a space will remove any prior name.
@@ -1066,8 +1070,8 @@ When you use one of these objects, if its effect is obvious, NetHack
 will remember what it is for you.  If its effect isn't extremely
 obvious, you will be asked what you want to call this type of object
 so you will recognize it later.  You can also use the ``#name''
-command for the same purpose at any time, to name all objects of a
-particular type or just an individual object.
+command, or its synonym `C', for the same purpose at any time, to name
+all objects of a particular type or just an individual object.
 When you use ``#name'' on an object which has already been named,
 specifying a space as the value will remove the prior name instead
 of assigning a new one.
--- a/doc/Guidebook.tex
+++ b/doc/Guidebook.tex
@@ -31,7 +31,7 @@
 \begin{document}
 %
 % input file: guidebook.mn
-% $Revision: 1.104 $ $Date: 2007/02/18 04:49:19 $
+% $Revision: 1.105 $ $Date: 2007/04/27 02:05:28 $
 %
 %.ds h0 "
 %.ds h1 %.ds h2 \%
@@ -44,7 +44,7 @@
 %.au
 \author{Eric S. Raymond\\
 (Extensively edited and expanded for 3.5)}
-\date{September 20, 2006}
+\date{May 24, 2007}

 \maketitle

@@ -669,7 +669,8 @@ Redo the previous command.
 Close a door.
 %.lp
 \item[\tb{C}]
-Call (name) an individual monster.
+Call (name) a monster, an individual object, or an object type.
+Same as extended command ``{\tt \#name}''.
 %.lp
 \item[\tb{\^{}C}]
 Panic button.  Quit the game.
@@ -940,7 +941,7 @@ from a horse standing next to you.
 Use a monster's special ability (when polymorphed into monster form).
 %.lp
 \item[\tb{\#name}]
-Name an item or type of object.
+Name a monster, an individual object, or a type of object.  Same as `{\tt C}'.
 %.lp
 \item[\tb{\#offer}]
 Offer a sacrifice to the gods.
@@ -1080,6 +1081,9 @@ from a horse standing next to you.  Same as ``{\tt \#loot}'' or ``{\tt M-l}''.
 %.lp
 \item[\tb{N}]
 Name an object or type of object.  Same as ``{\tt \#name}'' or ``{\tt M-n}''.
+Name a monster, an individual object, or a type of object.  Same
+as ``{\tt \#name}'' (or ``{\tt M-n}'') which is the same as the `{\tt C}'
+command.
 %.lp
 \item[\tb{u}]
 Untrap a trap, door, or chest.  Same as ``{\tt \#untrap}'' or ``{\tt M-u}''.
@@ -1263,7 +1267,8 @@ very well).
 %.pg
 The commands `{\tt /}' and `{\tt ;}' may be used to obtain information
 about those
-monsters who are displayed on the screen.  The command `{\tt C}' allows you
+monsters who are displayed on the screen.  The command ``{\tt \#name}'', or
+its synonym `{\tt C}', allows you
 to assign a name to a monster, which may be useful to help distinguish
 one from another when multiple monsters are present.  Assigning a name
 which is just a space will remove any prior name.
@@ -1396,8 +1401,8 @@ When you use one of these objects, if its effect is obvious, {\it NetHack\/}
 will remember what it is for you.  If its effect isn't extremely
 obvious, you will be asked what you want to call this type of object
 so you will recognize it later.  You can also use the ``{\tt \#name}''
-command for the same purpose at any time, to name all objects of a
-particular type or just an individual object.
+command, or its synonym `{\tt C}', for the same purpose at any time, to name
+all objects of a particular type or just an individual object.
 When you use ``{\tt \#name}'' on an object which has already been named,
 specifying a space as the value will remove the prior name instead
 of assigning a new one.
--- a/doc/fixes35.0
+++ b/doc/fixes35.0
@@ -336,6 +336,7 @@ pile_limit option to control when to switch to "there are objects here"
 	vs listing objects on floor when hero goes over objects while moving
 some monsters will use fire to prevent selves being turned into green slime
 add `#vanquished' debug mode command
+C and #name commands are now same and use menu to choose monster vs object


 Platform- and/or Interface-Specific New Features