new 'sortvanquished' option

Allow the preferred sort order for the vanquished monsters list to
be specified in the run-time config file
|OPTIONS=sortvanquished:X
where X is t, d, a, c, n, or z.  It can also be set to 'A' or 'C'
but those aren't documented and aren't offered as choices when
setting the value interactively, which can be done via 'm O' or by
using 'm #vanquished'.

Guidebook.mn has been updated but Guidebook.tex is lagging again.

include/decl.h

@@ -561,14 +561,14 @@ struct trapinfo {
 };
 
 enum vanq_order_modes {
-    VANQ_MLVL_MNDX = 0,
-    VANQ_MSTR_MNDX,
-    VANQ_ALPHA_SEP,
-    VANQ_ALPHA_MIX,
-    VANQ_MCLS_HTOL,
-    VANQ_MCLS_LTOH,
-    VANQ_COUNT_H_L,
-    VANQ_COUNT_L_H,
+    VANQ_MLVL_MNDX = 0, /* t - traditional: by monster level */
+    VANQ_MSTR_MNDX,     /* d - by difficulty rating */
+    VANQ_ALPHA_SEP,     /* a - alphabetical, first uniques, then ordinary */
+    VANQ_ALPHA_MIX,     /* A - alpha with uniques and ordinary intermixed */
+    VANQ_MCLS_HTOL,     /* C - by class, high to low within class */
+    VANQ_MCLS_LTOH,     /* c - by class, low to high within class */
+    VANQ_COUNT_H_L,     /* n - by count, high to low */
+    VANQ_COUNT_L_H,     /* z - by count, low to high */
 
     NUM_VANQ_ORDER_MODES
 };
@@ -1562,7 +1562,6 @@ struct instance_globals_v {
 
     /* end.c */
     struct val_list valuables[3];
-    int vanq_sortmode;
 
     /* mhitm.c */
     boolean vis;

include/extern.h

@@ -1092,6 +1092,7 @@ extern schar achieve_rank(int);
 extern boolean sokoban_in_play(void);
 extern int do_gamelog(void);
 extern void show_gamelog(int);
+extern int set_vanq_order(void);
 extern int dovanquished(void);
 extern int doborn(void);
 extern void list_vanquished(char, boolean);

include/flag.h

@@ -87,6 +87,7 @@ struct flag {
     int pile_limit;    /* controls feedback when walking over objects */
     char discosort;    /* order of dodiscovery/doclassdisco output: o,s,c,a */
     char sortloot; /* 'n'=none, 'l'=loot (pickup), 'f'=full ('l'+invent) */
+    uchar vanq_sortmode; /* [uint_8] order of vanquished monsters: 0..7 */
     char inv_order[MAXOCLASSES];
     char pickup_types[MAXOCLASSES];
 #define NUM_DISCLOSURE_OPTIONS 6 /* i,a,v,g,c,o (decl.c) */

include/optlist.h

@@ -537,6 +537,9 @@ static int optfn_##a(int, int, boolean, char *, char *);
                 "sort object selection lists by description")
     NHOPTB(sortpack, Advanced, 0, opt_out, set_in_game,
                 On, Yes, No, No, NoAlias, &flags.sortpack)
+    NHOPTC(sortvanquished, Advanced, 0, opt_in, set_in_game,
+                Yes, Yes, No, Yes, NoAlias,
+                "preferred order when displaying vanquished monsters")
     NHOPTB(sparkle, Map, 0, opt_out, set_in_game,
                 On, Yes, No, No, NoAlias, &flags.sparkle)
     NHOPTB(splash_screen, Advanced, 0, opt_out, set_in_config,

include/patchlevel.h

@@ -17,7 +17,7 @@
  * Incrementing EDITLEVEL can be used to force invalidation of old bones
  * and save files.
  */
-#define EDITLEVEL 66
+#define EDITLEVEL 67
 
 /*
  * Development status possibilities.