Merge branch 'NetHack-3.6.0'

doc/Guidebook.tex

@@ -45,18 +45,10 @@
 %.au
 \author{Original version - Eric S. Raymond\\
 (Edited and expanded for 3.6 by Mike Stephenson and others)}
-\date{April 14, 2018}
+\date{April 19, 2018}
 
 \maketitle
 
-%.hn 1
-\section{Preface - Version 3.6}
-%.pg
-This version of the game is special in a particular way.  Near the end of
-the development of 3.6, one of the significant inspirations for many of the
-humorous and fun features found in the game, author {\it Terry Pratchett},
-passed away.  We have dedicated this version of the game in his memory.
-
 %.pg
 %.hn 1
 \section{Introduction}
@@ -816,8 +808,7 @@ Engrave a message on the floor.\\
 %.lp ""
 Engraving the word ``{\tt Elbereth}'' will cause most monsters to not attack
 you hand-to-hand (but if you attack, you will rub it out); this is
-often useful to give yourself a breather.  (This feature may be compiled out
+often useful to give yourself a breather.
-of the game, so your version might not have it.)
 %.lp
 \item[\tb{f}]
 Fire one of the objects placed in your quiver (or quiver sack, or that you
@@ -2700,10 +2691,10 @@ for system administrators.
 
 %.pg
 The default name of the configuration file varies on different
-operating systems. On DOS and Windows, it is ``defaults.nh''
+operating systems. On DOS and Windows, it is \mbox{``defaults.nh''}
-in the same folder as {\it nethack.exe\/} or {\it nethackW.exe\/}. On Unix, Linux
+in the same folder as \mbox{{\it nethack.exe\/}} or \mbox{{\it nethackW.exe\/}}. 
-and Mac OS X it is ``.nethackrc'' in the user's home directory.
+On Unix, Linux and Mac OS X it is \mbox{``.nethackrc''} in the user's home 
-The file may not exist, but it is a normal ASCII text file and
+directory. The file may not exist, but it is a normal ASCII text file and
 can be created with any text editor.
 
 %.pg
@@ -5182,10 +5173,10 @@ joined the {\it NetHack\/} development team.
 
 %.pg
 \medskip
-The 3.6 versions of the game are special in a particular way.  Near the end of
+Near the end of the development of 3.6.0, one of the significant inspirations 
-the development of 3.6.0, one of the significant inspirations for many of
+for many of the humorous and fun features found in the game, 
-the humorous and fun features found in the game, author Terry Pratchett,
+author Terry Pratchett, passed away. {\it NetHack\/} 3.6.0 introduced 
-passed away.  The 3.6 versions of the game include a tribute to him.
+a tribute to him.
 
 %.pg
 \medskip
@@ -5197,8 +5188,9 @@ patches.  Many bugs were fixed and some code was restructured.
 \medskip
 In 2018, several hundred bug fixes for 3.6.0 and some new features
 were assembled and released as NetHack 3.6.1. The development team at
-the time of release of 3.6.1 consisted of {\it Michael Allison},
+the time of release of 3.6.1 consisted of 
-{\it Ken Arromdee}, {\it David Cohrs}, {\it Jessie Collet},
+{\it Warwick Allison}, {\it Michael Allison}, {\it Ken Arromdee}, 
+{\it David Cohrs}, {\it Jessie Collet},
 {\it Pasi Kallinen}, {\it Ken Lorber}, {\it Dean Luick},
 {\it Patric Mueller}, {\it Pat Rankin}, {\it Derek S. Ray},
 {\it Alex Smith}, {\it Mike Stephenson}, {\it Janet Walz}, and

doc/fixes36.1

@@ -539,6 +539,7 @@ gas spore explosion killing a gas spore which triggers a recursive explosion
 wizard mode 'sanity_check' gave spurious "mon not on map" warnings when mounted
 at the prompt for entering a level annotation, responding with <return>
 	erroneously removed old annotation; use <space><return> to do that
+reorder the #droptype menu and add some separator lines
 
 
 Fixes to Post-3.6.0 Problems that Were Exposed Via git Repository

doc/tmac.n

@@ -53,13 +53,6 @@
 .\"	occurred when the the "fo" trap position was reset just beneath
 .\"	the current line; the footnote overflow trap would kick in and
 .\"	never be closed.
-.\" **********
-.\" Version 1.6.361	April 15, 2018
-.\"	The version distributed with NetHack 3.6.1 has changed the
-.\"	trademark notice for "UNIX"(tm) [ux macro] to reflect current
-.\"	ownership: The Open Group.  [The pd and vx macros are also long
-.\"	out of date: DEC -> Compaq -> HP -> ? but haven't been changed;
-.\"	need confirmation that Hewlett Packard is the current owner.]
 .\"
 .\"
 .\" **********
@@ -625,8 +618,7 @@
 .	nr ux +1			\" mark footnote as dropped
 \\&\\$2\\s-1UNIX\\s0\\*(rg\\$1
 .	fn				\" put out the footnote
-.\" was "\\&\\*(rgUNIX is a registered trademark of AT&T."
+\\&\\*(rgUNIX is a registered trademark of AT&T.
-\\&\\*(rgUNIX is a registered trademark of The Open Group.
 .	ef				\" short and sweet ...
 .\}
 ..

src/pickup.c

@@ -1061,6 +1061,20 @@ int how;               /* type of query */
     win = create_nhwindow(NHW_MENU);
     start_menu(win);
     pack = flags.inv_order;
+
+    if (qflags & CHOOSE_ALL) {
+        invlet = 'A';
+        any = zeroany;
+        any.a_int = 'A';
+        add_menu(win, NO_GLYPH, &any, invlet, 0, ATR_NONE,
+                 (qflags & WORN_TYPES) ? "Auto-select every item being worn"
+                                       : "Auto-select every item",
+                 MENU_UNSELECTED);
+
+        any = zeroany;
+        add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE, "", MENU_UNSELECTED);
+    }
+
     if ((qflags & ALL_TYPES) && (ccount > 1)) {
         invlet = 'a';
         any = zeroany;
@@ -1097,6 +1111,13 @@ int how;               /* type of query */
             return 0;
         }
     } while (*pack);
+
+    if (do_unpaid || (qflags & BILLED_TYPES) || do_blessed || do_cursed
+        || do_uncursed || do_buc_unknown) {
+        any = zeroany;
+        add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE, "", MENU_UNSELECTED);
+    }
+
     /* unpaid items if there are any */
     if (do_unpaid) {
         invlet = 'u';
@@ -1113,15 +1134,7 @@ int how;               /* type of query */
         add_menu(win, NO_GLYPH, &any, invlet, 0, ATR_NONE,
                  "Unpaid items already used up", MENU_UNSELECTED);
     }
-    if (qflags & CHOOSE_ALL) {
+
-        invlet = 'A';
-        any = zeroany;
-        any.a_int = 'A';
-        add_menu(win, NO_GLYPH, &any, invlet, 0, ATR_NONE,
-                 (qflags & WORN_TYPES) ? "Auto-select every item being worn"
-                                       : "Auto-select every item",
-                 MENU_UNSELECTED);
-    }
     /* items with b/u/c/unknown if there are any;
        this cluster of menu entries is in alphabetical order,
        reversing the usual sequence of 'U' and 'C' in BUCX */