Skip to content

Commit c7d9249

Browse files
committed
Fix: Druid in wildshape form looting a monster that is wearing armor would show '(merged to your form)' for their worn armor.
1 parent 2bf16e4 commit c7d9249

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

doc/evilhack-changelog.md

+2
Original file line numberDiff line numberDiff line change
@@ -3997,4 +3997,6 @@ The following changes to date are:
39973997
- Add escape spellbook descriptions to the in-game encyclopedia
39983998
- Fix: a few spellbook entries to the in-game encyclopedia could not
39993999
be accessed
4000+
- Fix: Druid in wildshape form looting a monster that is wearing armor
4001+
would show '(merged to your form)' for their worn armor
40004002

src/objnam.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -1453,7 +1453,8 @@ unsigned doname_flags;
14531453
because donning() returns True for both cases */
14541454
: doffing(obj) ? " (being doffed)"
14551455
: donning(obj) ? " (being donned)"
1456-
: druid_form ? " (merged to your form)"
1456+
: (druid_form && (owner == &youmonst))
1457+
? " (merged to your form)"
14571458
: obj->otyp == MUMMIFIED_HAND ? " "
14581459
: " (being worn)");
14591460
/* slippery fingers is an intrinsic condition of the hero

0 commit comments

Comments
 (0)