nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

more message adjustments to chests with broken locks

Browse Source
This commit is contained in:
nhmall
2018-03-18 08:49:25 -04:00
parent e07c6b5b77
commit e7ed6508cd
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/fixes36.1
+2 -2
View File
@@ -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 prevent Mjollnir from being auto-quivered if it's been thrown without return
and then picked back up while quiver slot is empty and then picked back up while quiver slot is empty
plural of "fox" is not "foxen" plural of "fox" is not "foxen"
change wording from "broken chest" to "lock-damaged chest" and suppress #force change wording from "broken chest" to "chest with a broken lock" and during
", but its lock is already broken" when lock-damaged was already shown #force" suppress redundant info when locks state is unknown
Platform- and/or Interface-Specific Fixes Platform- and/or Interface-Specific Fixes
src/lock.c
+3 -3
View File
@@ -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. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -550,8 +550,8 @@ doforce()
if (Is_box(otmp)) { if (Is_box(otmp)) {
if (otmp->obroken) { if (otmp->obroken) {
There("is %s here%s.", doname(otmp), There("is %s here%s.", doname(otmp),
/* The displayed name will have already been prefixed /* The displayed name will have already stated
* with "lock-damaged" if otmp->lknown is already set * "with a broken lock" if otmp->lknown is already set
* so suppress the additional notification about the * so suppress the additional notification about the
* lock in that case. */ * lock in that case. */
!otmp->lknown ? ", but its lock is already broken" : ""); !otmp->lknown ? ", but its lock is already broken" : "");
src/objnam.c
+5 -5
View File
@@ -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. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -995,10 +995,10 @@ unsigned doname_flags;
if (lknown && Is_box(obj)) { if (lknown && Is_box(obj)) {
if (obj->obroken) if (obj->obroken)
/* 3.6.0 used "unlockable" here but that could be misunderstood /* 3.6.0 used an "unlockable" prefix here but that could be
to mean "capable of being unlocked" rather than the intended misunderstood to mean "capable of being unlocked" rather
"not capable of being locked" */ than the intended "not capable of being locked" */
Strcat(prefix, "lock-damaged "); Strcat(bp, " with a broken lock");
else if (obj->olocked) else if (obj->olocked)
Strcat(prefix, "locked "); Strcat(prefix, "locked ");
else else