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

another item-action: 'i' to #adjust inventory

Browse Source 
Add context-sensitive inventory item-action 'i' to run the #adjust
command.  Groundwork for item-action 'I' to use #adjust to split a
stack is included but non-functional.

Also reorders some of the enums and switch cases to be alphabetical
by their menu selection letter, dip moves from 'd' (which is drop)
to 'a' and offer/sacrifice moves from last to 'O'.
This commit is contained in:
PatR
2022-04-20 00:55:19 -07:00
parent eb6e6312e6
commit 627fa5efad
1 changed files with 41 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/invent.c
View File

@@ -2525,14 +2525,17 @@ RESTORE_WARNING_FORMAT_NONLITERAL
enum item_action_actions {
IA_NONE = 0,
IA_UNWIELD, /* hack for 'w-' */
IA_APPLY_OBJ,
IA_APPLY_OBJ, /* 'a' */
IA_DIP_OBJ, /* 'a' on a potion == dip */
IA_NAME_OBJ, /* 'c' name individual item */
IA_NAME_OTYP, /* 'C' name item's type */
IA_DIP_OBJ,
IA_DROP_OBJ,
IA_EAT_OBJ,
IA_ENGRAVE_OBJ,
IA_BUY_OBJ,
IA_DROP_OBJ, /* 'd' */
IA_EAT_OBJ, /* 'e' */
IA_ENGRAVE_OBJ, /* 'E' */
IA_ADJUST_OBJ, /* 'i' #adjust inventory letter */
IA_ADJUST_STACK, /* 'I' #adjust with count to split stack */
IA_SACRIFICE, /* 'O' offer sacrifice */
IA_BUY_OBJ, /* 'p' pay shopkeeper */
IA_QUAFF_OBJ,
IA_QUIVER_OBJ,
IA_READ_OBJ,
@@ -2545,7 +2548,6 @@ enum item_action_actions {
IA_WEAR_OBJ,
IA_SWAPWEAPON,
IA_ZAP_OBJ,
IA_SACRIFICE,
};
/* construct text for the menu entries for IA_NAME_OBJ and IA_NAME_OTYP */
@@ -2775,6 +2777,17 @@ itemactions(struct obj *otmp)
ia_addmenu(win, IA_ENGRAVE_OBJ, 'E',
"Write on the floor with this object");
/* i: #adjust inventory letter */
if (otmp->oclass != COIN_CLASS) /* gold is always "letter" '$' */
ia_addmenu(win, IA_ADJUST_OBJ, 'i',
"Adjust inventory by assigning new letter");
#if 0
/* I: #adjust inventory item by splitting its stack */
if (otmp->quan > 1L && otmp->oclass != COIN_CLASS)
ia_addmenu(win, IA_ADJUST_STACK, 'I',
"Adjust inventory by splitting this stack");
#endif
/* O: offer sacrifice */
if (IS_ALTAR(levl[u.ux][u.uy].typ) && !u.uswallow) {
/* FIXME: this doesn't match #offer's likely candidates, which don't
@@ -2924,12 +2937,6 @@ itemactions(struct obj *otmp)
cmdq_add_ec(doapply);
cmdq_add_key(otmp->invlet);
break;
case IA_NAME_OBJ:
case IA_NAME_OTYP:
cmdq_add_ec(docallcmd);
cmdq_add_key((act == IA_NAME_OBJ) ? 'i' : 'o');
cmdq_add_key(otmp->invlet);
break;
case IA_DIP_OBJ:
/* #altdip instead of normal #dip - takes potion to dip into
first (the inventory item instigating this) and item to
@@ -2938,6 +2945,12 @@ itemactions(struct obj *otmp)
cmdq_add_ec(dip_into);
cmdq_add_key(otmp->invlet);
break;
case IA_NAME_OBJ:
case IA_NAME_OTYP:
cmdq_add_ec(docallcmd);
cmdq_add_key((act == IA_NAME_OBJ) ? 'i' : 'o');
cmdq_add_key(otmp->invlet);
break;
case IA_DROP_OBJ:
cmdq_add_ec(dodrop);
cmdq_add_key(otmp->invlet);
@@ -2953,6 +2966,21 @@ itemactions(struct obj *otmp)
cmdq_add_ec(doengrave);
cmdq_add_key(otmp->invlet);
break;
case IA_ADJUST_OBJ:
cmdq_add_ec(doorganize); /* #adjust */
cmdq_add_key(otmp->invlet);
break;
case IA_ADJUST_STACK:
#if 0 /* will need an alternate command routine (like #altdip) in
* order to prompt for a count */
cmdq_add_ec(doorganize);
cmdq_add_key(otmp->invlet);
#endif
break;
case IA_SACRIFICE:
cmdq_add_ec(dosacrifice);
cmdq_add_key(otmp->invlet);
break;
case IA_BUY_OBJ:
cmdq_add_ec(dopay);
cmdq_add_key(otmp->invlet);
@@ -3007,10 +3035,6 @@ itemactions(struct obj *otmp)
cmdq_add_ec(dozap);
cmdq_add_key(otmp->invlet);
break;
case IA_SACRIFICE:
cmdq_add_ec(dosacrifice);
cmdq_add_key(otmp->invlet);
break;
}
}
destroy_nhwindow(win);