simplify #overview shop handling

Add the shop type variations used for automatically generated
annotations to the shop structure and get rid of the switch that
has been being used to pick them.

src/shknam.c

@@ -1,4 +1,4 @@
-/* NetHack 3.7	shknam.c	$NHDT-Date: 1596498209 2020/08/03 23:43:29 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.57 $ */
+/* NetHack 3.7	shknam.c	$NHDT-Date: 1715203028 2024/05/08 21:17:08 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.78 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Robert Patrick Rankin, 2011. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -204,7 +204,7 @@ static const char *const shkhealthfoods[] = {
  * shtypes[] is externally referenced from mkroom.c, mon.c and shk.c. 
  */
 const struct shclass shtypes[] = {
-    { "general store",
+    { "general store", NULL,
       RANDOM_CLASS,
       42,
       D_SHOP,
@@ -215,7 +215,7 @@ const struct shclass shtypes[] = {
         { 0, 0 },
         { 0, 0 } },
       shkgeneral },
-    { "used armor dealership",
+    { "used armor dealership", "armor shop",
       ARMOR_CLASS,
       14,
       D_SHOP,
@@ -226,7 +226,7 @@ const struct shclass shtypes[] = {
         { 0, 0 },
         { 0, 0 } },
       shkarmors },
-    { "second-hand bookstore",
+    { "second-hand bookstore", "scroll shop",
       SCROLL_CLASS,
       10,
       D_SHOP,
@@ -237,7 +237,7 @@ const struct shclass shtypes[] = {
         { 0, 0 },
         { 0, 0 } },
       shkbooks },
-    { "liquor emporium",
+    { "liquor emporium", "potion shop",
       POTION_CLASS,
       10,
       D_SHOP,
@@ -248,7 +248,7 @@ const struct shclass shtypes[] = {
         { 0, 0 },
         { 0, 0 } },
       shkliquors },
-    { "antique weapons outlet",
+    { "antique weapons outlet", "weapon shop",
       WEAPON_CLASS,
       5,
       D_SHOP,
@@ -259,7 +259,7 @@ const struct shclass shtypes[] = {
         { 0, 0 },
         { 0, 0 } },
       shkweapons },
-    { "delicatessen",
+    { "delicatessen", NULL,
       FOOD_CLASS,
       5,
       D_SHOP,
@@ -270,7 +270,7 @@ const struct shclass shtypes[] = {
         { 3, -ICE_BOX },
         { 0, 0 } },
       shkfoods },
-    { "jewelers",
+    { "jewelers", NULL,
       RING_CLASS,
       3,
       D_SHOP,
@@ -281,7 +281,7 @@ const struct shclass shtypes[] = {
         { 0, 0 },
         { 0, 0 } },
       shkrings },
-    { "quality apparel and accessories",
+    { "quality apparel and accessories", "wand shop",
       WAND_CLASS,
       3,
       D_SHOP,
@@ -290,7 +290,7 @@ const struct shclass shtypes[] = {
         { 5, -ELVEN_CLOAK },
         { 0, 0 } },
       shkwands },
-    { "hardware store",
+    { "hardware store", NULL,
       TOOL_CLASS,
       3,
       D_SHOP,
@@ -301,7 +301,7 @@ const struct shclass shtypes[] = {
         { 0, 0 },
         { 0, 0 } },
       shktools },
-    { "rare books",
+    { "rare books", "bookstore",
       SPBOOK_CLASS,
       3,
       D_SHOP,
@@ -312,7 +312,7 @@ const struct shclass shtypes[] = {
         { 0, 0 },
         { 0, 0 } },
       shkbooks },
-    { "health food store",
+    { "health food store", NULL,
       FOOD_CLASS,
       2,
       D_SHOP,
@@ -327,7 +327,7 @@ const struct shclass shtypes[] = {
      * probability of zero.  They are only created via the special level
      * loader.
      */
-    { "lighting store",
+    { "lighting store", "lighting shop",
       TOOL_CLASS,
       0,
       D_SHOP,
@@ -342,7 +342,7 @@ const struct shclass shtypes[] = {
         { 1, -SPE_LIGHT } },
       shklight },
     /* sentinel */
-    { (char *) 0,
+    { (char *) 0, NULL,
       0,
       0,
       0,
@@ -915,4 +915,6 @@ is_izchak(struct monst *shkp, boolean override_hallucination)
     return (boolean) !strcmp(shknm, "Izchak");
 }
 
+#undef VEGETARIAN_CLASS
+
 /*shknam.c*/