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

Add 'pickup_stolen' option

Browse Source 
Add pickup_stolen option to autopick items stolen from you by a nymph or
monkey, even if they don't match your normal autopickup settings.
Replace was_dropped, was_thrown with a 2-bit bitfield that can contain
values LOST_DROPPED, LOST_THROWN, and LOST_STOLEN (or 0), since they
should all be mutually exclusive anyway as they track the most recent
way the item left the hero's inventory.

[Rebase/merge conflict fixed up.  PR]
This commit is contained in:
Michael Meyer
2023-11-17 09:37:16 -05:00
committed by PatR
parent ecda85cc32
commit 1736f3caaa
15 changed files with 54 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/invent.c
View File

@@ -942,7 +942,8 @@ merged(struct obj **potmp, struct obj **pobj)
items, where this would be too spammy as such items get
unidentified by monsters very frequently). */
if (discovered && otmp->where == OBJ_INVENT
&& !obj->was_thrown && !otmp->was_thrown) {
&& obj->how_lost != LOST_THROWN
&& otmp->how_lost != LOST_THROWN) {
pline("You learn more about your items by comparing them.");
}
@@ -1049,8 +1050,8 @@ addinv_core0(struct obj *obj, struct obj *other_obj,
obj->no_charge = 0; /* should not be set in hero's invent */
if (Has_contents(obj))
picked_container(obj); /* clear no_charge */
obj_was_thrown = obj->was_thrown;
obj->was_thrown = obj->was_dropped = 0; /* not meaningful for invent */
obj_was_thrown = (obj->how_lost == LOST_THROWN);
obj->how_lost = LOST_NONE;
if (gl.loot_reset_justpicked) {
gl.loot_reset_justpicked = FALSE;
@@ -4823,8 +4824,7 @@ mergable(
if (obj->unpaid != otmp->unpaid || obj->spe != otmp->spe
|| obj->no_charge != otmp->no_charge || obj->obroken != otmp->obroken
|| obj->otrapped != otmp->otrapped || obj->lamplit != otmp->lamplit
|| obj->was_thrown != otmp->was_thrown
|| obj->was_dropped != otmp->was_dropped)
|| obj->how_lost != otmp->how_lost)
return FALSE;
if (obj->oclass == FOOD_CLASS