redo the #H9479 fix - worn dented pot

Handle recently changed armoroff() differently.  There should be no
change in behavior.

boots_simple_name(), shield_simple_name(), and shirt_simple_name()
are for no-delay armor types so won't be called by armoroff().  But
they'll undoubtedly get some use in the future.

include/extern.h

@@ -1,4 +1,4 @@
-/* NetHack 3.6	extern.h	$NHDT-Date: 1574648937 2019/11/25 02:28:57 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.760 $ */
+/* NetHack 3.6	extern.h	$NHDT-Date: 1575768406 2019/12/08 01:26:46 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.766 $ */
 /* Copyright (c) Steve Creps, 1988.				  */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -1796,6 +1796,9 @@ E const char *FDECL(suit_simple_name, (struct obj *));
 E const char *FDECL(cloak_simple_name, (struct obj *));
 E const char *FDECL(helm_simple_name, (struct obj *));
 E const char *FDECL(gloves_simple_name, (struct obj *));
+E const char *FDECL(boots_simple_name, (struct obj *));
+E const char *FDECL(shield_simple_name, (struct obj *));
+E const char *FDECL(shirt_simple_name, (struct obj *));
 E const char *FDECL(mimic_obj_name, (struct monst *));
 E char *FDECL(safe_qbuf, (char *, const char *, const char *, struct obj *,
                           char *(*)(OBJ_P), char *(*)(OBJ_P), const char *));

src/do_wear.c

@@ -1,4 +1,4 @@
-/* NetHack 3.6	do_wear.c	$NHDT-Date: 1575214670 2019/12/01 15:37:50 $  $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.116 $ */
+/* NetHack 3.6	do_wear.c	$NHDT-Date: 1575768410 2019/12/08 01:26:50 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.126 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Robert Patrick Rankin, 2012. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -1464,11 +1464,11 @@ struct obj *obj;
         return 0;
     }
 
-    reset_remarm(); /* clear g.context.takeoff.mask and g.context.takeoff.what */
+    reset_remarm(); /* clear context.takeoff.mask and context.takeoff.what */
     (void) select_off(obj);
     if (!g.context.takeoff.mask)
         return 0;
-    /* none of armoroff()/Ring_/Amulet/Blindf_off() use g.context.takeoff.mask */
+    /* none of armoroff()/Ring_/Amulet/Blindf_off() use context.takeoff.mask */
     reset_remarm();
 
     if (obj->owornmask & W_ARMOR) {
@@ -1584,70 +1584,76 @@ struct obj *otmp;
     if (delay) {
         nomul(delay);
         g.multi_reason = "disrobing";
-        if (is_helmet(otmp)) {
+        switch (objects[otmp->otyp].oc_armcat) {
-            what = helm_simple_name(otmp);
+        case ARM_SUIT:
-            g.afternmv = Helmet_off;
-        } else if (is_gloves(otmp)) {
-            what = gloves_simple_name(otmp);
-            g.afternmv = Gloves_off;
-        } else if (is_boots(otmp)) {
-            what = c_boots;
-            g.afternmv = Boots_off;
-        } else if (is_suit(otmp)) {
             what = suit_simple_name(otmp);
             g.afternmv = Armor_off;
-        } else if (is_cloak(otmp)) {
+            break;
+        case ARM_SHIELD:
+            what = shield_simple_name(otmp);
+            g.afternmv = Shield_off;
+            break;
+        case ARM_HELM:
+            what = helm_simple_name(otmp);
+            g.afternmv = Helmet_off;
+            break;
+        case ARM_GLOVES:
+            what = gloves_simple_name(otmp);
+            g.afternmv = Gloves_off;
+            break;
+        case ARM_BOOTS:
+            what = boots_simple_name(otmp);
+            g.afternmv = Boots_off;
+            break;
+        case ARM_CLOAK:
             what = cloak_simple_name(otmp);
             g.afternmv = Cloak_off;
-        } else if (is_shield(otmp)) {
+            break;
-            what = c_shield;
+        case ARM_SHIRT:
-            g.afternmv = Shield_off;
+            what = shirt_simple_name(otmp);
-        } else if (is_shirt(otmp)) {
-            what = c_shirt;
             g.afternmv = Shirt_off;
-        } else {
+            break;
+        default:
             impossible("Taking off unknown armor (%d: %d), delay %d",
                        otmp->otyp, objects[otmp->otyp].oc_armcat, delay);
+            break;
         }
         if (what) {
+            /* sizeof offdelaybuf == 60; increase it if this becomes longer */
             Sprintf(offdelaybuf, "You finish taking off your %s.", what);
             g.nomovemsg = offdelaybuf;
         }
     } else {
-        /* Be warned!  We want off_msg after removing the item to
+        /* no delay so no '(*afternmv)()' or 'nomovemsg' */
-         * avoid "You were wearing ____ (being worn)."  However, an
+        switch (objects[otmp->otyp].oc_armcat) {
-         * item which grants fire resistance might cause some trouble
+        case ARM_SUIT:
-         * if removed in Hell and lifesaving puts it back on; in this
-         * case the message will be printed at the wrong time (after
-         * the messages saying you died and were lifesaved).  Luckily,
-         * no cloak, shield, or fast-removable armor grants fire
-         * resistance, so we can safely do the off_msg afterwards.
-         * Rings do grant fire resistance, but for rings we want the
-         * off_msg before removal anyway so there's no problem.  Take
-         * care in adding armors granting fire resistance; this code
-         * might need modification.
-         * 3.2 (actually 3.1 even): that comment is obsolete since
-         * fire resistance is not required for Gehennom so setworn()
-         * doesn't force the resistance granting item to be re-worn
-         * after being lifesaved anymore.
-         */
-        if (is_cloak(otmp))
-            (void) Cloak_off();
-        else if (is_shield(otmp))
-            (void) Shield_off();
-        else if (is_helmet(otmp))
-            (void) Helmet_off();
-        else if (is_gloves(otmp))
-            (void) Gloves_off();
-        else if (is_boots(otmp))
-            (void) Boots_off();
-        else if (is_shirt(otmp))
-            (void) Shirt_off();
-        else if (is_suit(otmp))
             (void) Armor_off();
-        else
+            break;
+        case ARM_SHIELD:
+            (void) Shield_off();
+            break;
+        case ARM_HELM:
+            (void) Helmet_off();
+            break;
+        case ARM_GLOVES:
+            (void) Gloves_off();
+            break;
+        case ARM_BOOTS:
+            (void) Boots_off();
+            break;
+        case ARM_CLOAK:
+            (void) Cloak_off();
+            break;
+        case ARM_SHIRT:
+            (void) Shirt_off();
+            break;
+        default:
             impossible("Taking off unknown armor (%d: %d), no delay",
                        otmp->otyp, objects[otmp->otyp].oc_armcat);
+            break;
+        }
+        /* We want off_msg() after removing the item to
+           avoid "You were wearing ____ (being worn)." */
         off_msg(otmp);
     }
     g.context.takeoff.mask = g.context.takeoff.what = 0L;

src/objnam.c

@@ -1,4 +1,4 @@
-/* NetHack 3.7	objnam.c	$NHDT-Date: 1575245076 2019/12/02 00:04:36 $  $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.255 $ */
+/* NetHack 3.7	objnam.c	$NHDT-Date: 1575768412 2019/12/08 01:26:52 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.273 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Robert Patrick Rankin, 2011. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -4241,6 +4241,65 @@ struct obj *gloves;
     return "gloves";
 }
 
+/* boots vs shoes; depends upon discovery state */
+const char *
+boots_simple_name(boots)
+struct obj *boots;
+{
+    static const char shoes[] = "shoes";
+
+    if (boots && boots->dknown) {
+        int otyp = boots->otyp;
+        struct objclass *ocl = &objects[otyp];
+        const char *actualn = OBJ_NAME(*ocl),
+                   *descrpn = OBJ_DESCR(*ocl);
+
+        if (strstri(descrpn, shoes)
+            || (objects[otyp].oc_name_known && strstri(actualn, shoes)))
+            return shoes;
+    }
+    return "boots";
+}
+
+/* simplified shield for messages */
+const char *
+shield_simple_name(shield)
+struct obj *shield;
+{
+    if (shield) {
+        /* xname() describes unknown (unseen) reflection as smooth */
+        if (shield->otyp == SHIELD_OF_REFLECTION)
+            return shield->dknown ? "silver shield" : "smooth shield";
+        /*
+         * We might distinguish between wooden vs metallic or
+         * light vs heavy to give small benefit to spell casters.
+         * Fighter types probably care more about the former for
+         * vulnerability to fire or rust.
+         *
+         * We could do that both ways: light wooden shield, light
+         * metallic shield (there aren't any), heavy wooden shield,
+         * and heavy metallic shield but that's getting away from
+         * "simple name" which is intended to be shorter as well
+         * as less detailed than xname().
+         */
+#if 0
+        /* spellcasting uses a division like this */
+        return (weight(shield) > (int) objects[SMALL_SHIELD].oc_weight)
+               ? "heavy shield"
+               : "light shield";
+#endif
+    }
+    return "shield";
+}
+
+/* for completness */
+const char *
+shirt_simple_name(shirt)
+struct obj *shirt UNUSED;
+{
+    return "shirt";
+}
+
 const char *
 mimic_obj_name(mtmp)
 struct monst *mtmp;