Merge branch 'NetHack-3.7' of https://github.com/nethack/nethack

This picks up an important fix in which playing the tutorial branch set
a nofollowers flag that meant both tame and hostile monsters would not
follow the player between levels.

Since it has been a short time since the last merge, conflicts were
minor. Notes:
- Moved various object init bits into the new mksobj_init function.

I updated the xNetHack editlevel to 1 because vanilla has introduced
savebreaking changes since the last merge.

dat/data.base

@@ -1,5 +1,5 @@
 # NetHack 3.7	data.base
-# $NHDT-Date: 1608767189 2020/12/23 23:46:29 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.99 $
+# $NHDT-Date: 1684001509 2023/05/13 18:11:49 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.106 $
 #	Copyright (c) 1994, 1995, 1996 by the NetHack Development Team
 #	Copyright (c) 1994 by Boudewijn Wayers
 #	NetHack may be freely redistributed.  See license for details.
@@ -3669,12 +3669,19 @@ huge chunk of meat
 		[ Grace Before Meat, by Robert Burns ]
 # nethack's Medusa doesn't match the myth very closely, particularly in
 # how reflection is involved, but that's par for the course
+#
+# this used to begin "Medusa, one of the three Gorgons or Graeae" as
+# if Graeae and Gorgons where the same thing, but Bulfinch's Mythology
+# indicates that they are quite different; since the first paragraph is
+# a made-up introduction to an excerpt from that work, the contradictory
+# mention of Graeae has been removed
 medusa
 perseus
 shield of reflection
-	Medusa, one of the three Gorgons or Graeae, is the only one
-	of her sisters to have assumed mortal form and inhabited the
-	dungeon world.
+	Medusa, one of the three Gorgons, is the only one of her
+	sisters to have assumed mortal form and inhabited the dungeon
+	world.
+		[]
 
 	When Perseus was grown up Polydectes sent him to attempt the
 	conquest of Medusa, a terrible monster who had laid waste the

doc/Guidebook.mn

@@ -37,7 +37,7 @@
 .ds f0 "\*(vr
 .ds f1
 .\"DO NOT REMOVE NH_DATESUB .ds f2 "DATE(%B %-d, %Y)
-.ds f2 "April 19, 2023
+.ds f2 "May 7, 2023
 .
 .\" A note on some special characters:
 .\" \(lq = left double quote
@@ -1309,8 +1309,8 @@ The \(oqm\(cq prefix brings up a menu of available sorting orders, and
 doing that for either #genocided or #vanquished changes the order for both.
 .lp ""
 If the sorting order is \(lqcount high to low\(rq or \(lqcount low to high\(rq
-(which are applicable for #vanquished), that will be ignored for #genocided
-and alphabetical will be used instead.
+(which are applicable for #vanquished), that will be ignored
+for #genocided and alphabetical will be used instead.
 The menu omits those two choices when used for #genocide.
 .lp ""
 Autocompletes.

doc/Guidebook.tex

@@ -46,7 +46,7 @@
 \author{Original version - Eric S. Raymond\\
 (Edited and expanded for 3.7.0 by Mike Stephenson and others)}
 %DO NOT REMOVE NH_DATESUB \date{DATE(%B %-d, %Y)}
-\date{April 19, 2023}
+\date{May 7, 2023}
 
 \maketitle
 
@@ -748,7 +748,8 @@ \section{Commands}
 show a list of discovered objects in a particular class) commands to offer
 a menu of several sorting alternatives (which sets a new value for the
 {\it sortdiscoveries\/}
-option); also for ``{\tt \#vanquished}'' command to offer a sorting menu.
+option); also for ``{\tt \#vanquished}'' and ``{\tt \#genocided}'' commands
+to offer a sorting menu.
 \\
 %.lp ""
 A few other commands (eat food, offer sacrifice, apply tinning-kit,
@@ -1409,7 +1410,22 @@ \section{Commands}
 Force a lock. Autocompletes. Default key is `{\tt M-f}'.
 %.lp
 \item[\tb{\#genocided}]
-List any monster types which have been genocided or become extinct.
+List any monster types which have been genocided.
+In explore mode and debug mode it also shows types which have become
+extinct.
+\\
+%.lp ""
+The display order is the same as is used by {\\tt \#vanquished}.
+The `{\tt m}' prefix brings up a menu of available sorting orders, and
+doing that for either {\\tt \#genocided} or {\\tt \#vanquished} changes the order for both.
+\\
+%.lp ""
+If the sorting order is ``count high to low'' or ``count low to high''
+(which are applicable for {\tt \#vanquished}), that will be ignored
+for {\tt \#genocided} and alphabetical will be used instead.
+The menu omits those two choices when used for {\tt \#genocide}.
+\\
+%.lp ""
 Autocompletes.
 Default key is `{\tt M-g}'.
 %.lp
@@ -1849,6 +1865,9 @@ \section{Commands}
 list contains at least two types of monsters).
 Whichever ordering is picked gets assigned to the {\it sortvanquished}
 option so is remembered for subsequent \#vanquished requests.
+The {\tt \#genocided} command shares this sorting order.
+\\
+%.lp ""
 During end-of-game disclosure, when asked whether to show vanquished
 monsters answering `{\tt a}' will let you choose from the sort menu.
 \\
@@ -4212,6 +4231,8 @@ \subsection*{Customization options}
 
 The listing of vanquished monsters can be sorted,
 so there are two additional choices for `{\tt v}':
+The listings of vanquished monsters and of genocided types can be sorted,
+so there are two additional choices for `q' and `g':
 %.sd
 %.si
 {\tt ?} --- prompt you and default to ask on the prompt;\\
@@ -4222,8 +4243,9 @@ \subsection*{Customization options}
 Asking refers to picking one of the orderings from a menu.
 The `{\tt +}' disclose without prompting choice,
 or being prompted and answering `{\tt y}' rather than `{\tt a}',
-will default to showing monsters in the traditional order,
-from high level to low level.\\
+will default to showing monsters in the order specified by the
+{\it sortvanquished\/} option.
+\\
 %.lp ""
 Omitted categories are implicitly added with `{\tt n}' prefix.
 Specified categories with omitted prefix implicitly use `{\tt +}' prefix.
@@ -4908,7 +4930,8 @@ \subsection*{Customization options}
 Persistent.
 %.lp
 \item[\tb{sortvanquished}]
-Controls the sorting behavior for the output of the \#vanquished command.
+Controls the sorting behavior for the output of the {\tt \#vanquished} command
+and also for the {\tt \#genocided} command.
 Persistent.
 \\
 %.lp ""
@@ -4944,7 +4967,8 @@ \subsection*{Customization options}
 \\
 %.PE
 Can be interactively set via the `{\tt m O}' command or via using
-the `{\tt m}' prefix before the \#vanquished command.
+the `{\tt m}' prefix before either the {\tt \#vanquished} command
+or the {\tt \#genocided} command.
 %.lp
 \item[\ib{sounds}]
 Allow sounds to be emitted from an integrated sound library (default on).