Skip to content

Commit e5730c1

Browse files
committed
Ensure unique undead monsters are appropriately hostile towards Draugr.
1 parent 4349ecb commit e5730c1

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

doc/evilhack-changelog.md

+1
Original file line numberDiff line numberDiff line change
@@ -3432,4 +3432,5 @@ The following changes to date are:
34323432
- Draugr and various interactions with NPC's
34333433
- Draugr can regenerate hit points while in the Valley of the Dead
34343434
- More role-specific bits for Draugr
3435+
- Ensure unique undead monsters are appropriately hostile towards Draugr
34353436

src/makemon.c

+4-3
Original file line numberDiff line numberDiff line change
@@ -3969,8 +3969,8 @@ register struct monst *mtmp;
39693969
being non-hostile to unaligned, then the usual check for coaligned.
39703970
For crowned Infidels, the random check is bypassed. Followers of
39713971
Lolth - if they are Drow, stay chaotic, and are at least fervently
3972-
aligned, she will spawn peaceful. Undead will be peaceful towards
3973-
Draugr more often than not */
3972+
aligned, she will spawn peaceful. Undead (non-uniques) will be
3973+
peaceful towards Draugr more often than not */
39743974
if (always_hostile(ptr)) {
39753975
if (Role_if(PM_INFIDEL) && is_demon(ptr)
39763976
&& (u.uevent.uhand_of_elbereth || rn2(2))) {
@@ -3980,7 +3980,8 @@ register struct monst *mtmp;
39803980
&& !Upolyd && Race_if(PM_DROW)) {
39813981
return TRUE;
39823982
} else if (!Upolyd && Race_if(PM_DRAUGR)
3983-
&& is_undead(ptr) && rn2(3)) {
3983+
&& is_undead(ptr)
3984+
&& !unique_corpstat(ptr) && rn2(3)) {
39843985
return TRUE;
39853986
} else {
39863987
return FALSE;

0 commit comments

Comments
 (0)