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

item action for towel

Browse Source 
Change the menu entry for putting on a towel to "Put this on to blindfold
yourself" since "Use this ..." seems ambiguous.

Also, for the 'P' and 'R' item actions, list amulets before rings like
most other routines that can deal with both.
This commit is contained in:
PatR
2025-10-18 10:20:13 -07:00
parent da20b839b5
commit a9f84bfe9a
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/invent.c
+10 -9
View File
@@ -3339,20 +3339,21 @@ itemactions(struct obj *otmp)
'P' will fail but we don't want to omit the choice because 'P' will fail but we don't want to omit the choice because
item actions can be used to learn commands */ item actions can be used to learn commands */
*buf = '\0'; *buf = '\0';
if (otmp->oclass == RING_CLASS || otmp->otyp == MEAT_RING) { if (otmp->oclass == AMULET_CLASS) {
Strcpy(buf, (!uleft || !uright) ? "Put this ring on"
: "[both ring fingers in use]");
} else if (otmp->oclass == AMULET_CLASS) {
Strcpy(buf, !uamul ? "Put this amulet on" Strcpy(buf, !uamul ? "Put this amulet on"
: "[already wearing an amulet]"); : "[already wearing an amulet]");
} else if (otmp->otyp == TOWEL || otmp->otyp == BLINDFOLD } else if (otmp->oclass == RING_CLASS || otmp->otyp == MEAT_RING) {
Strcpy(buf, (!uleft || !uright) ? "Put this ring on"
: "[both ring fingers in use]");
} else if (otmp->otyp == BLINDFOLD || otmp->otyp == TOWEL
|| otmp->otyp == LENSES) { || otmp->otyp == LENSES) {
if (ublindf) if (ublindf)
Strcpy(buf, "[already wearing eyewear]"); Strcpy(buf, "[already wearing eyewear]");
else if (otmp->otyp == LENSES) else if (otmp->otyp == LENSES)
Strcpy(buf, "Put these lenses on"); Strcpy(buf, "Put these lenses on");
else else
Strcpy(buf, "Use this to blindfold yourself"); Sprintf(buf, "Put this on%s",
(otmp->otyp == TOWEL) ? " to blindfold yourself" : "");
} }
if (*buf) if (*buf)
ia_addmenu(win, IA_WEAR_OBJ, 'P', buf); ia_addmenu(win, IA_WEAR_OBJ, 'P', buf);
@@ -3381,10 +3382,10 @@ itemactions(struct obj *otmp)
/* R: remove accessory or rub item */ /* R: remove accessory or rub item */
if (otmp->owornmask & W_ACCESSORY) { if (otmp->owornmask & W_ACCESSORY) {
Sprintf(buf, "Remove this %s", Sprintf(buf, "Remove this %s",
(otmp->owornmask & W_RING) ? "ring" (otmp->owornmask & W_AMUL) ? "amulet"
: (otmp->owornmask & W_AMUL) ? "amulet" : (otmp->owornmask & W_RING) ? "ring"
: (otmp->owornmask & W_TOOL) ? "eyewear" : (otmp->owornmask & W_TOOL) ? "eyewear"
: "accessory"); /* catchall */ : "accessory"); /* catchall -- can't happen */
ia_addmenu(win, IA_TAKEOFF_OBJ, 'R', buf); ia_addmenu(win, IA_TAKEOFF_OBJ, 'R', buf);
} }
if (otmp->otyp == OIL_LAMP || otmp->otyp == MAGIC_LAMP if (otmp->otyp == OIL_LAMP || otmp->otyp == MAGIC_LAMP