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

improve the menu for setting pickup_types option

Browse Source 
For
|Autopickup what?
| a - amulets
 ...
| A - all classes
prevent invert all and set all from setting the 'A - all classes'
entry.  For invert, toggling it is wrong.  For set, suppressing it
from being set is academic since all other entries get set.

Simplify the notes about what happens when no classes are selected,
and when autopickup is On about how to not autopickup anything at all.
Add one when it's Off, about how to make the chosen classes matter.
This commit is contained in:
PatR
2023-11-29 21:37:40 -08:00
parent 6332b17177
commit 9847fcb5b1
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/windows.c
View File

@@ -1678,23 +1678,20 @@ choose_classes_menu(const char *prompt,
add_menu_str(win, "");
any = cg.zeroany;
any.a_int = (int) ' ';
Sprintf(buf, "%c %s", (char) any.a_int, "all classes of objects");
Sprintf(buf, "%c %s", (char) any.a_int, "All classes of objects");
/* we won't preselect this even if the incoming list is empty;
having it selected means that it would have to be explicitly
de-selected in order to select anything else */
add_menu(win, &nul_glyphinfo, &any, 'A', 0,
ATR_NONE, clr, buf, MENU_ITEMFLAGS_NONE);
ATR_NONE, clr, buf, MENU_ITEMFLAGS_SKIPINVERT);
if (!strcmp(prompt, "Autopickup what?")) {
Sprintf(buf, "%4s%c %s", " ", ' ',
add_menu_str(win,
"Note: when no choices are selected, \"all\" is implied.");
add_menu_str(win, buf);
if (flags.pickup) {
/* for 'O', "toggle" should be intuitive; for 'm O', it would
probably be better to say "Set 'autopickup' to false..." */
Sprintf(buf, "%4s%c %s", " ", ' ',
"Toggle off 'autopickup' to not pick up anything.");
add_menu_str(win, buf);
}
/* for 'O', "toggle" should be intuitive; for 'm O', it would
probably be better to say "Set 'autopickup' to true|false" */
add_menu_str(win, flags.pickup
? "Toggle off 'autopickup' to not pick up anything."
: "Toggle on 'autopickup' to automatically pick these things up.");
}
}
end_menu(win, prompt);