Skip to content

Commit 0ed3bb6

Browse files
committed
Fix: prevent Nazgul from attacking undead hobbit types.
1 parent 96220c8 commit 0ed3bb6

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
@@ -3383,3 +3383,5 @@ The following changes to date are:
33833383
- Fix: monster priests shouldn't wield edged weapons either
33843384
- Fix: reactivate offhand weapon intrinsics when catching a returning weapon
33853385
- Fix: samurai splint mails were not always rustproof
3386+
- Fix: prevent Nazgul from attacking undead hobbit types
3387+

src/mon.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -2714,7 +2714,8 @@ struct monst *magr, *mdef;
27142714
return ALLOW_M | ALLOW_TM;
27152715

27162716
/* Nazgul vs hobbits */
2717-
if (ma == &mons[PM_NAZGUL] && racial_hobbit(mdef))
2717+
if (ma == &mons[PM_NAZGUL]
2718+
&& (racial_hobbit(mdef) && !is_undead(md)))
27182719
return ALLOW_M | ALLOW_TM;
27192720

27202721
/* bees and honey badgers don't play nice */

0 commit comments

Comments
 (0)