more message adjustments to chests with broken locks

diff --git a/doc/fixes36.1 b/doc/fixes36.1
index ce3ebc86e8de7fa66751ab5a2ed1eeeaf4a4c46e..51f5abcd544cb9aba5fcf2909b94da4cf88accf0 100644 (file)
--- a/doc/fixes36.1
+++ b/doc/fixes36.1
@@ -609,8 +609,8 @@ when clairvoyance lets you move the cursor to examine the map (if it occurs
 prevent Mjollnir from being auto-quivered if it's been thrown without return
        and then picked back up while quiver slot is empty
 plural of "fox" is not "foxen"
-change wording from "broken chest" to "lock-damaged chest" and suppress #force
-       ", but its lock is already broken" when lock-damaged was already shown
+change wording from "broken chest" to "chest with a broken lock" and during
+       #force" suppress redundant info when locks state is unknown
 
 
 Platform- and/or Interface-Specific Fixes

diff --git a/src/lock.c b/src/lock.c
index 99f6c75c9e4758cdd050523e31d507b88479797d..1e3e43d061d4ae8cb306beadfc63964a4d4d06e2 100644 (file)
--- a/src/lock.c
+++ b/src/lock.c
@@ -1,4 +1,4 @@
-/* NetHack 3.6 lock.c  $NHDT-Date: 1446955300 2015/11/08 04:01:40 $  $NHDT-Branch: master $:$NHDT-Revision: 1.67 $ */
+/* NetHack 3.6 lock.c  $NHDT-Date: 1521377334 2018/03/18 12:48:54 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.78 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -550,8 +550,8 @@ doforce()
         if (Is_box(otmp)) {
             if (otmp->obroken) {
                 There("is %s here%s.", doname(otmp),
-                      /* The displayed name will have already been prefixed
-                       * with "lock-damaged" if otmp->lknown is already set
+                      /* The displayed name will have already stated
+                       * "with a broken lock" if otmp->lknown is already set
                        * so suppress the additional notification about the
                        * lock in that case. */
                       !otmp->lknown ? ", but its lock is already broken" : "");

diff --git a/src/objnam.c b/src/objnam.c
index 88d105d41157c51741d87f0170bedc73c4d0dd76..28c211f69c262e0f6241529081664f48784dfacb 100644 (file)
--- a/src/objnam.c
+++ b/src/objnam.c
@@ -1,4 +1,4 @@
-/* NetHack 3.6 objnam.c        $NHDT-Date: 1521254016 2018/03/17 02:33:36 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.192 $ */
+/* NetHack 3.6 objnam.c        $NHDT-Date: 1521377345 2018/03/18 12:49:05 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.194 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -995,10 +995,10 @@ unsigned doname_flags;
 
     if (lknown && Is_box(obj)) {
         if (obj->obroken)
-            /* 3.6.0 used "unlockable" here but that could be misunderstood
-               to mean "capable of being unlocked" rather than the intended
-               "not capable of being locked" */
-            Strcat(prefix, "lock-damaged ");
+            /* 3.6.0 used an "unlockable" prefix here but that could be
+               misunderstood to mean "capable of being unlocked" rather
+               than the intended "not capable of being locked" */
+            Strcat(bp, " with a broken lock");
         else if (obj->olocked)
             Strcat(prefix, "locked ");
         else