Add omit_buc -option

The option defaults to on, which is the old-style behaviour.
Turning the option off will never omit the "uncursed" -status
from inventory lines. This is pretty much required if users
want to use menucolors based on the BUC state.
This commit is contained in:
Pasi Kallinen
2015-05-27 12:46:31 +03:00
parent a65c568e49
commit 5fabcdf692
7 changed files with 10 additions and 1 deletions

View File

@@ -24,6 +24,7 @@ mail enable the mail daemon [TRUE]
null allow nulls to be sent to your terminal [TRUE] null allow nulls to be sent to your terminal [TRUE]
try turning this option off (forcing NetHack to use its own try turning this option off (forcing NetHack to use its own
delay code) if moving objects seem to teleport across rooms delay code) if moving objects seem to teleport across rooms
omit_buc omit "uncursed" from inventory, if possible [TRUE]
perm_invent keep inventory in a permanent window [FALSE] perm_invent keep inventory in a permanent window [FALSE]
pickup_thrown override pickup_types for thrown objects [TRUE] pickup_thrown override pickup_types for thrown objects [TRUE]
pushweapon when wielding a new weapon, put your previously pushweapon when wielding a new weapon, put your previously

View File

@@ -2196,6 +2196,8 @@ location of the `y' and `z' keys swapped.)
When moving by numbers, to enter a count prefix for those commands When moving by numbers, to enter a count prefix for those commands
which accept one (such as ``12s'' to search twelve times), precede it which accept one (such as ``12s'' to search twelve times), precede it
with the letter `n' (``n12s''). with the letter `n' (``n12s'').
.lp omit_buc
Omit "uncursed" from inventory lists, if possible (default on).
.lp packorder .lp packorder
Specify the order to list object types in (default ``")[%?+!=/(*`0_''). Specify the order to list object types in (default ``")[%?+!=/(*`0_'').
The value of this option should be a string containing the The value of this option should be a string containing the

View File

@@ -2641,6 +2641,9 @@ When moving by numbers, to enter a count prefix for those commands
which accept one (such as ``{\tt 12s}'' to search twelve times), precede it which accept one (such as ``{\tt 12s}'' to search twelve times), precede it
with the letter `{\tt n}' (``{\tt n12s}''). with the letter `{\tt n}' (``{\tt n12s}'').
%.lp %.lp
\item[\ib{omit\_buc}]
Omit ``uncursed'' from inventory lists, if possible (default on).
%.lp
\item[\ib{packorder}] \item[\ib{packorder}]
Specify the order to list object types in (default Specify the order to list object types in (default
``\verb&")[%?+!=/(*`0_&''). The value of this option should be a string ``\verb&")[%?+!=/(*`0_&''). The value of this option should be a string

View File

@@ -918,6 +918,7 @@ long worms can no longer be leashed
the chest in the Castle containing the wishing wand can never be trapped the chest in the Castle containing the wishing wand can never be trapped
the vibrating square is now a trap the vibrating square is now a trap
mimics wouldn't take on the form of "strange object" mimics wouldn't take on the form of "strange object"
add an option to prevent omitting the uncursed status from inventory
Platform- and/or Interface-Specific Fixes Platform- and/or Interface-Specific Fixes

View File

@@ -194,6 +194,7 @@ struct instance_flags {
boolean deferred_X; /* deferred entry into explore mode */ boolean deferred_X; /* deferred entry into explore mode */
boolean num_pad; /* use numbers for movement commands */ boolean num_pad; /* use numbers for movement commands */
boolean news; /* print news */ boolean news; /* print news */
boolean omit_buc; /* omit "uncursed" status in inventory lists */
boolean mention_walls; /* give feedback when bumping walls */ boolean mention_walls; /* give feedback when bumping walls */
boolean menu_tab_sep; /* Use tabs to separate option menu fields */ boolean menu_tab_sep; /* Use tabs to separate option menu fields */
boolean menu_head_objsym; /* Show obj symbol in menu headings */ boolean menu_head_objsym; /* Show obj symbol in menu headings */

View File

@@ -778,7 +778,7 @@ register struct obj *obj;
Strcat(prefix, "cursed "); Strcat(prefix, "cursed ");
else if (obj->blessed) else if (obj->blessed)
Strcat(prefix, "blessed "); Strcat(prefix, "blessed ");
else if ((!known || !objects[obj->otyp].oc_charged else if (!iflags.omit_buc || (!known || !objects[obj->otyp].oc_charged
|| (obj->oclass == ARMOR_CLASS || (obj->oclass == ARMOR_CLASS
|| obj->oclass == RING_CLASS)) || obj->oclass == RING_CLASS))
/* For most items with charges or +/-, if you know how many /* For most items with charges or +/-, if you know how many

View File

@@ -154,6 +154,7 @@ static struct Bool_Opt {
#endif #endif
{ "nudist", &u.uroleplay.nudist, FALSE, DISP_IN_GAME }, { "nudist", &u.uroleplay.nudist, FALSE, DISP_IN_GAME },
{ "null", &flags.null, TRUE, SET_IN_GAME }, { "null", &flags.null, TRUE, SET_IN_GAME },
{ "omit_buc", &iflags.omit_buc, TRUE, SET_IN_GAME },
#if defined(SYSFLAGS) && defined(MAC) #if defined(SYSFLAGS) && defined(MAC)
{ "page_wait", &sysflags.page_wait, TRUE, SET_IN_GAME }, { "page_wait", &sysflags.page_wait, TRUE, SET_IN_GAME },
#else #else